You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2020/03/03 06:32:16 UTC

[camel] branch master updated (9d156e7 -> 25a0232)

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

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


    from 9d156e7  CAMEL-14639: added synchronized blocks so that registry is now thread safe (#3607)
     new 669b8ac  [CAMEL-14628] Make sure the project can build after removing all generated sources
     new 7e76efe  Full regen
     new 60f4190  Extract languages into camel-core-languages so that we don't have a build cycle between camel-base / camel-core-engine
     new 17fc24b  Regen
     new 9823bec  Fix repositories
     new 2b81e6d  Fix docs
     new 699ee0d  Regen AWS components
     new 381b053  Rename Spark(Component|Endpoint) to SparkRest\1 to avoid conflicts in the endpoint dsl
     new 60bd43f  Regen bom
     new 94f12bc  Extract languages into camel-core-languages so that we don't have a build cycle between camel-base / camel-core-engine
     new 6f8f601  Rename Spark(Component|Endpoint) to SparkRest\1 to avoid conflicts in the endpoint dsl
     new 88bf36b  Fix rabbitmq doc and regen
     new 8378eec  Fix kafka component doc and regen
     new 6d22349  Regen (properties ordering)
     new ee0b600  Sort the endpoints correctly in case there is an parent/child relationship
     new 9224b44  Fix xml-security endpoints doc
     new d1b3d43  Sort the endpoints correctly in case there is an parent/child relationship
     new 25a0232  [CAMEL-14628] Make sure the project can build after removing all generated sources

The 18 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:
 bom/camel-bom/pom.xml                              |   5 +
 .../services/org/apache/camel/other.properties     |   7 -
 .../src/generated/resources/dummy-component.json   |  12 -
 .../apache/camel/component/activemq/activemq.json  |   2 +-
 .../src/main/docs/activemq-component.adoc          |   2 +-
 .../org/apache/camel/component/amqp/amqp.json      |   2 +-
 .../camel-amqp/src/main/docs/amqp-component.adoc   |   2 +-
 .../org/apache/camel/component/aws/s3/aws-s3.json  |   6 +-
 .../src/main/docs/aws-s3-component.adoc            |   6 +-
 .../apache/camel/component/aws/sqs/aws-sqs.json    |  14 +-
 .../src/main/docs/aws-sqs-component.adoc           |  14 +-
 .../apache/camel/component/aws/swf/aws-swf.json    |  30 +-
 .../src/main/docs/aws-swf-component.adoc           |  26 +-
 .../apache/camel/component/aws2/sqs/aws2-sqs.json  |  14 +-
 .../src/main/docs/aws2-sqs-component.adoc          |  14 +-
 .../org/apache/camel/component/box/box.json        |  10 +-
 .../src/main/docs/box-component.adoc               |  10 +-
 .../camel/component/braintree/braintree.json       |  10 +-
 .../src/main/docs/braintree-component.adoc         |  10 +-
 .../org/apache/camel/component/consul/consul.json  |  16 +-
 .../src/main/docs/consul-component.adoc            |  12 +-
 .../apache/camel/component/elytron/elytron.json    |   4 +-
 .../src/main/docs/elytron-component.adoc           |   2 +-
 .../org/apache/camel/component/fhir/fhir.json      |   8 +-
 .../src/main/docs/fhir-component.adoc              |   8 +-
 components/camel-ftp/pom.xml                       |   5 +
 .../apache/camel/component/file/remote/ftp.json    |   8 +-
 .../apache/camel/component/file/remote/ftps.json   |   8 +-
 .../apache/camel/component/file/remote/sftp.json   |   8 +-
 .../camel-ftp/src/main/docs/ftp-component.adoc     |   6 +-
 .../camel-ftp/src/main/docs/ftps-component.adoc    |   6 +-
 .../camel-ftp/src/main/docs/sftp-component.adoc    |   6 +-
 .../component/google/pubsub/google-pubsub.json     |   2 +-
 components/camel-hdfs/pom.xml                      |   5 +
 components/camel-ipfs/pom.xml                      |  14 -
 components/camel-jcache/pom.xml                    |   5 +
 components/camel-jira/pom.xml                      |   6 -
 .../org/apache/camel/component/jms/jms.json        |   2 +-
 .../camel-jms/src/main/docs/jms-component.adoc     |   2 +-
 .../org/apache/camel/component/jmx/jmx.json        |   8 +-
 .../camel-jmx/src/main/docs/jmx-component.adoc     |   6 +-
 components/camel-jpa/pom.xml                       |   4 +
 .../org/apache/camel/component/kafka/kafka.json    |  12 +-
 .../camel-kafka/src/main/docs/kafka-component.adoc |  10 +-
 .../org/apache/camel/component/mail/imap.json      |   4 +-
 .../org/apache/camel/component/mail/imaps.json     |   4 +-
 .../org/apache/camel/component/mail/pop3.json      |   4 +-
 .../org/apache/camel/component/mail/pop3s.json     |   4 +-
 .../org/apache/camel/component/mail/smtp.json      |   4 +-
 .../org/apache/camel/component/mail/smtps.json     |   4 +-
 .../camel-mail/src/main/docs/mail-component.adoc   |   2 +-
 .../org/apache/camel/component/mllp/mllp.json      |  12 +-
 .../camel-mllp/src/main/docs/mllp-component.adoc   |  10 +-
 .../apache/camel/component/rabbitmq/rabbitmq.json  |   2 +-
 .../src/main/docs/rabbitmq-component.adoc          |   2 +-
 ...urer.java => SparkRestComponentConfigurer.java} |   6 +-
 ...gurer.java => SparkRestEndpointConfigurer.java} |   4 +-
 .../services/org/apache/camel/component/spark-rest |   2 +-
 .../apache/camel/configurer/spark-rest-component   |   2 +-
 .../apache/camel/configurer/spark-rest-endpoint    |   2 +-
 .../camel/component/sparkrest/spark-rest.json      |   2 +-
 .../camel/component/sparkrest/CamelSparkRoute.java |   4 +-
 .../component/sparkrest/DefaultSparkBinding.java   |   2 +-
 .../camel/component/sparkrest/SparkConsumer.java   |   4 +-
 ...SparkComponent.java => SparkRestComponent.java} |   6 +-
 .../{SparkEndpoint.java => SparkRestEndpoint.java} |   8 +-
 .../camel/component/sparkrest/BaseSparkTest.java   |   2 +-
 .../sparkrest/DefaultSparkBindingTest.java         |   2 +-
 .../apache/camel/component/telegram/telegram.json  |   4 +-
 .../src/main/docs/telegram-component.adoc          |   4 +-
 .../directmessage/twitter-directmessage.json       |  12 +-
 .../component/twitter/search/twitter-search.json   |  12 +-
 .../twitter/timeline/twitter-timeline.json         |  12 +-
 .../main/docs/twitter-directmessage-component.adoc |  10 +-
 .../src/main/docs/twitter-search-component.adoc    |  10 +-
 .../src/main/docs/twitter-timeline-component.adoc  |  10 +-
 .../apache/camel/component/undertow/undertow.json  |   4 +-
 .../src/main/docs/undertow-component.adoc          |   2 +-
 .../apache/camel/component/weather/weather.json    |  28 +-
 .../src/main/docs/weather-component.adoc           |  28 +-
 components/camel-weka/pom.xml                      |  16 +-
 ...urer.java => XmlSignerComponentConfigurer.java} |   6 +-
 .../org/apache/camel/component/xmlsecurity-sign    |   2 +-
 .../camel/configurer/xmlsecurity-sign-component    |   2 +-
 .../component/xmlsecurity/xmlsecurity-sign.json    |  30 +-
 .../component/xmlsecurity/xmlsecurity-verify.json  |  28 +-
 .../src/main/docs/xmlsecurity-sign-component.adoc  |  28 +-
 .../main/docs/xmlsecurity-verify-component.adoc    |  28 +-
 ...atureComponent.java => XmlSignerComponent.java} | 132 ++--
 .../component/xmlsecurity/XmlSignerEndpoint.java   |   2 +-
 .../processor/XmlSignatureConfiguration.java       |  14 +-
 components/pom.xml                                 |  12 +
 core/camel-allcomponents/pom.xml                   |  16 +-
 .../services/org/apache/camel/language.properties  |   7 -
 core/camel-componentdsl/pom.xml                    |   8 -
 .../component/ComponentsBuilderFactory.java        |   3 +-
 .../dsl/ActivemqComponentBuilderFactory.java       |  30 +-
 .../component/dsl/AmqpComponentBuilderFactory.java |  30 +-
 .../dsl/AwsS3ComponentBuilderFactory.java          |  30 +-
 .../dsl/AwsSwfComponentBuilderFactory.java         | 158 ++--
 .../component/dsl/BoxComponentBuilderFactory.java  |  32 +-
 .../dsl/ConsulComponentBuilderFactory.java         |  82 +-
 .../dsl/GooglePubsubComponentBuilderFactory.java   |   6 +-
 .../component/dsl/JmsComponentBuilderFactory.java  |  30 +-
 .../dsl/KafkaComponentBuilderFactory.java          |  58 +-
 .../dsl/SparkRestComponentBuilderFactory.java      |  48 +-
 .../XmlsecuritySignComponentBuilderFactory.java    | 126 +--
 .../XmlsecurityVerifyComponentBuilderFactory.java  |  44 +-
 .../src/generated/resources/metadata.json          |   6 +-
 .../org/apache/camel/builder/SimpleBuilder.java    |   3 +-
 .../camel/model/language/TokenizerExpression.java  |   3 +-
 .../language/TokenizerExpressionReifier.java       |   1 -
 .../{camel-xml-io => camel-core-languages}/pom.xml |  20 +-
 .../services/org/apache/camel/language.properties  |   7 +
 .../services/org/apache/camel/language/constant    |   0
 .../org/apache/camel/language/exchangeProperty     |   0
 .../services/org/apache/camel/language/file        |   0
 .../services/org/apache/camel/language/header      |   0
 .../services/org/apache/camel/language/ref         |   0
 .../services/org/apache/camel/language/simple      |   0
 .../services/org/apache/camel/language/tokenize    |   0
 .../apache/camel/language/constant/constant.json   |   4 +-
 .../org/apache/camel/language/header/header.json   |   4 +-
 .../camel/language/property/exchangeProperty.json  |   4 +-
 .../org/apache/camel/language/ref/ref.json         |   4 +-
 .../org/apache/camel/language/simple/file.json     |   4 +-
 .../org/apache/camel/language/simple/simple.json   |   4 +-
 .../apache/camel/language/tokenizer/tokenize.json  |   4 +-
 .../src/main/docs/constant-language.adoc           |   0
 .../src/main/docs/exchangeProperty-language.adoc   |   0
 .../src/main/docs/file-language.adoc               |   0
 .../src/main/docs/header-language.adoc             |   0
 .../src/main/docs/ref-language.adoc                |   0
 .../src/main/docs/simple-language.adoc             |   0
 .../src/main/docs/tokenize-language.adoc           |   0
 .../camel/language/constant/ConstantLanguage.java  |   0
 .../apache/camel/language/constant/package.html    |   0
 .../camel/language/header/HeaderLanguage.java      |   0
 .../org/apache/camel/language/header/package.html  |   0
 .../java/org/apache/camel/language/package.html    |   0
 .../property/ExchangePropertyLanguage.java         |   0
 .../apache/camel/language/property/package.html    |   0
 .../org/apache/camel/language/ref/RefLanguage.java |   0
 .../org/apache/camel/language/ref/package.html     |   0
 .../camel/language/simple/BaseSimpleParser.java    |   0
 .../apache/camel/language/simple/FileLanguage.java |   0
 .../org/apache/camel/language/simple/Simple.java   |   0
 .../language/simple/SimpleExpressionBuilder.java   |   0
 .../language/simple/SimpleExpressionParser.java    |   0
 .../camel/language/simple/SimpleLanguage.java      |   0
 .../language/simple/SimplePredicateParser.java     |   0
 .../camel/language/simple/SimpleTokenizer.java     |   0
 .../camel/language/simple/ast/BaseSimpleNode.java  |   0
 .../language/simple/ast/BinaryExpression.java      |   0
 .../apache/camel/language/simple/ast/Block.java    |   0
 .../apache/camel/language/simple/ast/BlockEnd.java |   0
 .../camel/language/simple/ast/BlockStart.java      |   0
 .../camel/language/simple/ast/CompositeNodes.java  |   0
 .../camel/language/simple/ast/DoubleQuoteEnd.java  |   0
 .../language/simple/ast/DoubleQuoteStart.java      |   0
 .../language/simple/ast/LiteralExpression.java     |   0
 .../camel/language/simple/ast/LiteralNode.java     |   0
 .../language/simple/ast/LogicalExpression.java     |   0
 .../camel/language/simple/ast/NullExpression.java  |   0
 .../language/simple/ast/SimpleFunctionEnd.java     |   0
 .../simple/ast/SimpleFunctionExpression.java       |   0
 .../language/simple/ast/SimpleFunctionStart.java   |   0
 .../camel/language/simple/ast/SimpleNode.java      |   0
 .../camel/language/simple/ast/SingleQuoteEnd.java  |   0
 .../language/simple/ast/SingleQuoteStart.java      |   0
 .../camel/language/simple/ast/UnaryExpression.java |   0
 .../apache/camel/language/simple/ast/package.html  |   0
 .../org/apache/camel/language/simple/package.html  |   0
 .../language/simple/types/BinaryOperatorType.java  |   0
 .../language/simple/types/LogicalOperatorType.java |   0
 .../simple/types/SimpleIllegalSyntaxException.java |   0
 .../simple/types/SimpleParserException.java        |   0
 .../camel/language/simple/types/SimpleToken.java   |   0
 .../language/simple/types/SimpleTokenType.java     |   0
 .../camel/language/simple/types/TokenType.java     |   0
 .../language/simple/types/UnaryOperatorType.java   |   0
 .../camel/language/simple/types/package.html       |   0
 .../camel/language/tokenizer/TokenizeLanguage.java |   0
 .../apache/camel/language/tokenizer/package.html   |   0
 .../org/apache/camel/properties-component-factory  |   0
 core/camel-core-osgi/pom.xml                       |   5 +
 core/camel-core/pom.xml                            |   4 +
 core/camel-endpointdsl/pom.xml                     |  16 +
 .../builder/endpoint/EndpointBuilderFactory.java   |  19 +-
 .../camel/builder/endpoint/EndpointBuilders.java   |  19 +-
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |  50 +-
 ...ory.java => AWS2EC2EndpointBuilderFactory.java} | 123 +--
 .../dsl/ActiveMQEndpointBuilderFactory.java        |  38 -
 .../dsl/AsteriskEndpointBuilderFactory.java        |   4 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java |   4 +-
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |   9 +-
 .../endpoint/dsl/BoxEndpointBuilderFactory.java    | 178 ++---
 .../dsl/BraintreeEndpointBuilderFactory.java       | 617 ++++++++-------
 .../endpoint/dsl/BrowseEndpointBuilderFactory.java |  12 +-
 .../dsl/CaffeineCacheEndpointBuilderFactory.java   |   4 +-
 .../CaffeineLoadCacheEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/ClientEndpointBuilderFactory.java |  42 +-
 .../endpoint/dsl/CometdEndpointBuilderFactory.java |  28 +-
 .../endpoint/dsl/ConsulEndpointBuilderFactory.java | 122 +--
 .../dsl/ControlBusEndpointBuilderFactory.java      |  12 +-
 .../endpoint/dsl/CordaEndpointBuilderFactory.java  | 227 ++++++
 .../dsl/CryptoCmsEndpointBuilderFactory.java       |   4 +-
 ...Factory.java => Cw2EndpointBuilderFactory.java} | 133 ++--
 .../endpoint/dsl/CwEndpointBuilderFactory.java     |   4 +-
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  |  22 +-
 .../dsl/DataSetEndpointBuilderFactory.java         | 120 ++-
 .../dsl/DataSetTestEndpointBuilderFactory.java     | 128 ++-
 ...actory.java => Ddb2EndpointBuilderFactory.java} | 151 ++--
 ....java => Ddb2StreamEndpointBuilderFactory.java} | 208 ++---
 .../endpoint/dsl/DdbEndpointBuilderFactory.java    |   4 +-
 .../dsl/DdbStreamEndpointBuilderFactory.java       |   4 +-
 .../endpoint/dsl/DirectEndpointBuilderFactory.java |   9 +-
 .../dsl/DirectVmEndpointBuilderFactory.java        |  11 +-
 .../dsl/DisruptorEndpointBuilderFactory.java       |  12 +-
 .../dsl/DisruptorVmEndpointBuilderFactory.java     |  12 +-
 .../endpoint/dsl/DockerEndpointBuilderFactory.java |  81 ++
 .../endpoint/dsl/DrillEndpointBuilderFactory.java  |  12 +-
 .../endpoint/dsl/EC2EndpointBuilderFactory.java    |  12 +-
 .../endpoint/dsl/ECS2EndpointBuilderFactory.java   |  28 +-
 .../endpoint/dsl/ECSEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/EKS2EndpointBuilderFactory.java   |  34 +-
 .../endpoint/dsl/EKSEndpointBuilderFactory.java    |   4 +-
 .../dsl/ElasticsearchEndpointBuilderFactory.java   |  46 ++
 .../dsl/ElytronEndpointBuilderFactory.java         | 190 ++---
 ...ry.java => EtcdKeysEndpointBuilderFactory.java} | 259 +++---
 ...y.java => EtcdStatsEndpointBuilderFactory.java} | 274 ++++---
 ...y.java => EtcdWatchEndpointBuilderFactory.java} | 268 ++++---
 .../dsl/FacebookEndpointBuilderFactory.java        |  16 +-
 .../endpoint/dsl/FhirEndpointBuilderFactory.java   | 112 +--
 .../endpoint/dsl/FileEndpointBuilderFactory.java   |  96 +--
 .../endpoint/dsl/FtpEndpointBuilderFactory.java    |  92 ++-
 .../endpoint/dsl/FtpsEndpointBuilderFactory.java   | 218 ++---
 .../endpoint/dsl/GitHubEndpointBuilderFactory.java |  50 +-
 .../dsl/GoogleBigQueryEndpointBuilderFactory.java  |  40 +-
 .../GoogleBigQuerySQLEndpointBuilderFactory.java   |  37 +-
 .../dsl/GoogleCalendarEndpointBuilderFactory.java  | 228 +++---
 .../dsl/GoogleDriveEndpointBuilderFactory.java     | 228 +++---
 .../dsl/GoogleMailEndpointBuilderFactory.java      | 190 ++---
 .../dsl/GooglePubsubEndpointBuilderFactory.java    | 168 ++--
 .../dsl/GoogleSheetsEndpointBuilderFactory.java    | 196 ++---
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |  12 +-
 .../endpoint/dsl/HBaseEndpointBuilderFactory.java  |  12 +-
 ...azelcastAtomicnumberEndpointBuilderFactory.java |  72 +-
 .../HazelcastInstanceEndpointBuilderFactory.java   |  72 +-
 .../dsl/HazelcastListEndpointBuilderFactory.java   |  72 +-
 .../dsl/HazelcastMapEndpointBuilderFactory.java    |  72 +-
 .../HazelcastMultimapEndpointBuilderFactory.java   |  72 +-
 .../dsl/HazelcastQueueEndpointBuilderFactory.java  |  76 +-
 ...zelcastReplicatedmapEndpointBuilderFactory.java |  72 +-
 .../HazelcastRingbufferEndpointBuilderFactory.java |  72 +-
 .../dsl/HazelcastSedaEndpointBuilderFactory.java   |  78 +-
 .../dsl/HazelcastSetEndpointBuilderFactory.java    |  72 +-
 .../dsl/HazelcastTopicEndpointBuilderFactory.java  |  72 +-
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |   9 +-
 ...actory.java => IAM2EndpointBuilderFactory.java} | 145 ++--
 .../endpoint/dsl/IAMEndpointBuilderFactory.java    |   4 +-
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |  34 +-
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |  14 +-
 .../dsl/IgniteEventsEndpointBuilderFactory.java    |  12 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |   6 +-
 .../dsl/IgniteMessagingEndpointBuilderFactory.java |  11 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |   9 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |   9 +-
 .../endpoint/dsl/JMXEndpointBuilderFactory.java    | 172 ++--
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |   4 +-
 .../endpoint/dsl/JiraEndpointBuilderFactory.java   |  54 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    | 166 ++--
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |  75 ++
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/KMS2EndpointBuilderFactory.java   |  36 +-
 .../endpoint/dsl/KMSEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  | 122 +--
 ...ry.java => Kinesis2EndpointBuilderFactory.java} | 366 ++++-----
 .../dsl/KinesisEndpointBuilderFactory.java         |   4 +-
 ...=> KinesisFirehose2EndpointBuilderFactory.java} | 117 +--
 .../dsl/KinesisFirehoseEndpointBuilderFactory.java |   4 +-
 .../endpoint/dsl/KuduEndpointBuilderFactory.java   |  16 +-
 ...ory.java => Lambda2EndpointBuilderFactory.java} | 124 +--
 .../endpoint/dsl/LambdaEndpointBuilderFactory.java |   4 +-
 .../dsl/LanguageEndpointBuilderFactory.java        |  20 +-
 .../endpoint/dsl/LdapEndpointBuilderFactory.java   |   8 +-
 .../endpoint/dsl/LogEndpointBuilderFactory.java    |  12 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |  30 +-
 .../endpoint/dsl/MQEndpointBuilderFactory.java     |   4 +-
 .../endpoint/dsl/MSK2EndpointBuilderFactory.java   |  30 +-
 .../endpoint/dsl/MSKEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   | 149 +++-
 .../MicroProfileMetricsEndpointBuilderFactory.java |  36 +-
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   | 233 +++---
 .../endpoint/dsl/MockEndpointBuilderFactory.java   | 175 ++---
 .../dsl/MongoDbEndpointBuilderFactory.java         |  24 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |   4 +-
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  |  12 +-
 .../dsl/NettyHttpEndpointBuilderFactory.java       |  12 +-
 .../endpoint/dsl/NsqEndpointBuilderFactory.java    |  34 +-
 .../dsl/Olingo2EndpointBuilderFactory.java         | 504 ++++++------
 .../dsl/Olingo4EndpointBuilderFactory.java         | 504 ++++++------
 .../dsl/PgEventEndpointBuilderFactory.java         |   9 +-
 .../PgReplicationSlotEndpointBuilderFactory.java   |  16 +-
 .../dsl/PrinterEndpointBuilderFactory.java         |  20 +-
 .../endpoint/dsl/PulsarEndpointBuilderFactory.java | 155 ++--
 .../dsl/RabbitMQEndpointBuilderFactory.java        |  12 +
 .../dsl/RestOpenApiEndpointBuilderFactory.java     |   5 +-
 .../dsl/RestSwaggerEndpointBuilderFactory.java     |   5 +-
 .../endpoint/dsl/S3EndpointBuilderFactory.java     | 332 ++++----
 .../endpoint/dsl/SWFEndpointBuilderFactory.java    |  88 +--
 .../dsl/SalesforceEndpointBuilderFactory.java      |  12 +-
 .../dsl/SchedulerEndpointBuilderFactory.java       |  13 +-
 .../endpoint/dsl/SdbEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/SedaEndpointBuilderFactory.java   |  24 +-
 .../endpoint/dsl/ServerEndpointBuilderFactory.java |  42 +-
 .../dsl/ServletEndpointBuilderFactory.java         |   4 +-
 ...actory.java => Ses2EndpointBuilderFactory.java} | 124 +--
 .../endpoint/dsl/SesEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   | 332 ++++++--
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |  64 +-
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |  62 +-
 ...actory.java => Sns2EndpointBuilderFactory.java} | 163 ++--
 .../endpoint/dsl/SnsEndpointBuilderFactory.java    |   4 +-
 .../endpoint/dsl/SparkEndpointBuilderFactory.java  | 387 +++------
 ...y.java => SparkRestEndpointBuilderFactory.java} |  80 +-
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |  34 +-
 ...actory.java => Sqs2EndpointBuilderFactory.java} | 783 +++++++++---------
 .../endpoint/dsl/SqsEndpointBuilderFactory.java    | 284 +++----
 .../endpoint/dsl/StubEndpointBuilderFactory.java   |  29 +-
 .../dsl/TelegramEndpointBuilderFactory.java        |  80 +-
 .../endpoint/dsl/TikaEndpointBuilderFactory.java   |  13 +-
 .../endpoint/dsl/TimerEndpointBuilderFactory.java  |  35 +-
 .../dsl/Translate2EndpointBuilderFactory.java      |  48 +-
 .../dsl/TranslateEndpointBuilderFactory.java       |   4 +-
 ...TwitterDirectMessageEndpointBuilderFactory.java | 184 ++---
 .../dsl/TwitterSearchEndpointBuilderFactory.java   | 180 ++---
 .../dsl/TwitterTimelineEndpointBuilderFactory.java | 180 ++---
 .../dsl/UndertowEndpointBuilderFactory.java        | 188 ++---
 .../dsl/ValidatorEndpointBuilderFactory.java       |  28 +-
 .../dsl/WeatherEndpointBuilderFactory.java         | 490 ++++++------
 .../dsl/WebhookEndpointBuilderFactory.java         |  92 +--
 .../dsl/WebsocketEndpointBuilderFactory.java       |   9 +-
 .../endpoint/dsl/WekaEndpointBuilderFactory.java   |   4 +-
 .../dsl/WorkdayEndpointBuilderFactory.java         | 508 +-----------
 ...y.java => XmlSignerEndpointBuilderFactory.java} | 874 +++++++--------------
 .../dsl/XmlVerifierEndpointBuilderFactory.java     | 673 ++++++++++++++++
 .../endpoint/dsl/YammerEndpointBuilderFactory.java |  72 ++
 core/camel-main/pom.xml                            |   2 -
 .../camel-main-configuration-metadata.json         |   3 +-
 core/camel-xml-io/pom.xml                          |  16 +
 .../services/org/apache/camel/language.properties  |   7 -
 .../camel/converter/jaxp/DomConverterLoader.java   |  53 --
 .../camel/converter/jaxp/StaxConverterLoader.java  |  77 --
 .../jaxp/StreamSourceConverterLoader.java          |  38 -
 .../camel/converter/jaxp/XmlConverterLoader.java   | 159 ----
 .../camel/language/xtokenizer/xtokenize.json       |  25 -
 .../util/xml/StreamSourceConverterLoader.java      |  42 -
 core/pom.xml                                       |  13 +
 .../modules/ROOT/pages/activemq-component.adoc     |   2 +-
 .../modules/ROOT/pages/amqp-component.adoc         |   2 +-
 .../modules/ROOT/pages/aws-s3-component.adoc       |   6 +-
 .../modules/ROOT/pages/aws-sqs-component.adoc      |  14 +-
 .../modules/ROOT/pages/aws-swf-component.adoc      |  26 +-
 .../modules/ROOT/pages/aws2-sqs-component.adoc     |  14 +-
 .../modules/ROOT/pages/box-component.adoc          |  10 +-
 .../modules/ROOT/pages/braintree-component.adoc    |  10 +-
 .../modules/ROOT/pages/constant-language.adoc      |   2 +-
 .../modules/ROOT/pages/consul-component.adoc       |  12 +-
 .../modules/ROOT/pages/elytron-component.adoc      |   2 +-
 .../ROOT/pages/exchangeProperty-language.adoc      |   2 +-
 .../modules/ROOT/pages/fhir-component.adoc         |   8 +-
 .../modules/ROOT/pages/file-language.adoc          |   2 +-
 .../modules/ROOT/pages/ftp-component.adoc          |   6 +-
 .../modules/ROOT/pages/ftps-component.adoc         |   6 +-
 .../modules/ROOT/pages/header-language.adoc        |   2 +-
 docs/components/modules/ROOT/pages/index.adoc      |  20 +-
 .../modules/ROOT/pages/jms-component.adoc          |   2 +-
 .../modules/ROOT/pages/jmx-component.adoc          |   6 +-
 .../modules/ROOT/pages/kafka-component.adoc        |  10 +-
 .../modules/ROOT/pages/mail-component.adoc         |   2 +-
 .../modules/ROOT/pages/mllp-component.adoc         |  10 +-
 .../modules/ROOT/pages/rabbitmq-component.adoc     |   2 +-
 .../modules/ROOT/pages/ref-language.adoc           |   2 +-
 .../modules/ROOT/pages/sftp-component.adoc         |   6 +-
 .../modules/ROOT/pages/simple-language.adoc        |   2 +-
 .../modules/ROOT/pages/telegram-component.adoc     |   4 +-
 .../modules/ROOT/pages/tokenize-language.adoc      |   2 +-
 .../pages/twitter-directmessage-component.adoc     |  10 +-
 .../ROOT/pages/twitter-search-component.adoc       |  10 +-
 .../ROOT/pages/twitter-timeline-component.adoc     |  10 +-
 .../modules/ROOT/pages/undertow-component.adoc     |   2 +-
 .../modules/ROOT/pages/weather-component.adoc      |  28 +-
 .../ROOT/pages/xmlsecurity-sign-component.adoc     |  28 +-
 .../ROOT/pages/xmlsecurity-verify-component.adoc   |  28 +-
 docs/gulpfile.js                                   |   6 +-
 docs/pom.xml                                       |   8 -
 docs/user-manual/modules/ROOT/nav.adoc             |   7 -
 .../modules/ROOT/pages/constant-language.adoc      |   2 +-
 .../ROOT/pages/exchangeProperty-language.adoc      |   2 +-
 .../modules/ROOT/pages/file-language.adoc          |   2 +-
 .../modules/ROOT/pages/header-language.adoc        |   2 +-
 .../modules/ROOT/pages/ref-language.adoc           |   2 +-
 .../modules/ROOT/pages/simple-language.adoc        |   2 +-
 .../modules/ROOT/pages/tokenize-language.adoc      |   2 +-
 parent/pom.xml                                     |   5 +
 pom.xml                                            |  35 +
 .../apache/camel/tooling/util/JavadocHelper.java   |  38 +-
 .../camel/maven/packaging/EndpointDslMojo.java     |  98 ++-
 .../camel/maven/packaging/EndpointHelper.java      |   9 +-
 .../packaging/EndpointSchemaGeneratorMojo.java     | 103 ++-
 .../maven/packaging/PrepareCamelMainMojo.java      |  31 +-
 .../camel/maven/packaging/PrepareCatalogMojo.java  |  10 +-
 .../TypeConverterLoaderGeneratorMojo.java          |   3 +
 .../component/ComponentsDslMetadataRegistry.java   |   7 +-
 .../camel/maven/packaging/EndpointHelperTest.java  |  63 ++
 .../src/test/resources/json/test_component3.json   |  31 +
 .../src/test/resources/json/test_component4.json   |  22 -
 418 files changed, 9593 insertions(+), 9462 deletions(-)
 delete mode 100644 catalog/dummy-component/src/generated/resources/META-INF/services/org/apache/camel/other.properties
 delete mode 100644 catalog/dummy-component/src/generated/resources/dummy-component.json
 rename components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/{SparkComponentConfigurer.java => SparkRestComponentConfigurer.java} (94%)
 rename components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/{SparkEndpointConfigurer.java => SparkRestEndpointConfigurer.java} (93%)
 rename components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/{SparkComponent.java => SparkRestComponent.java} (97%)
 rename components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/{SparkEndpoint.java => SparkRestEndpoint.java} (94%)
 rename components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/{XmlSignatureComponentConfigurer.java => XmlSignerComponentConfigurer.java} (96%)
 rename components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/{XmlSignatureComponent.java => XmlSignerComponent.java} (91%)
 delete mode 100644 core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
 copy core/{camel-xml-io => camel-core-languages}/pom.xml (77%)
 create mode 100644 core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
 rename core/{camel-base => camel-core-languages}/src/generated/resources/META-INF/services/org/apache/camel/language/constant (100%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty (100%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/META-INF/services/org/apache/camel/language/file (100%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/META-INF/services/org/apache/camel/language/header (100%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/META-INF/services/org/apache/camel/language/ref (100%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/META-INF/services/org/apache/camel/language/simple (100%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize (100%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/org/apache/camel/language/constant/constant.json (95%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/org/apache/camel/language/header/header.json (94%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json (94%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/org/apache/camel/language/ref/ref.json (94%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/org/apache/camel/language/simple/file.json (95%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/org/apache/camel/language/simple/simple.json (95%)
 rename core/{camel-base => camel-core-languages}/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json (98%)
 rename core/{camel-base => camel-core-languages}/src/main/docs/constant-language.adoc (100%)
 rename core/{camel-base => camel-core-languages}/src/main/docs/exchangeProperty-language.adoc (100%)
 rename core/{camel-base => camel-core-languages}/src/main/docs/file-language.adoc (100%)
 rename core/{camel-base => camel-core-languages}/src/main/docs/header-language.adoc (100%)
 rename core/{camel-base => camel-core-languages}/src/main/docs/ref-language.adoc (100%)
 rename core/{camel-base => camel-core-languages}/src/main/docs/simple-language.adoc (100%)
 rename core/{camel-base => camel-core-languages}/src/main/docs/tokenize-language.adoc (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/constant/package.html (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/header/HeaderLanguage.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/header/package.html (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/package.html (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/property/package.html (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/ref/RefLanguage.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/ref/package.html (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/FileLanguage.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/Simple.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/Block.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/ast/package.html (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/package.html (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/types/TokenType.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/simple/types/package.html (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java (100%)
 rename core/{camel-base => camel-core-languages}/src/main/java/org/apache/camel/language/tokenizer/package.html (100%)
 copy core/{camel-base => camel-core-languages}/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory (100%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{EC2EndpointBuilderFactory.java => AWS2EC2EndpointBuilderFactory.java} (72%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{CwEndpointBuilderFactory.java => Cw2EndpointBuilderFactory.java} (70%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{DdbEndpointBuilderFactory.java => Ddb2EndpointBuilderFactory.java} (71%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{DdbStreamEndpointBuilderFactory.java => Ddb2StreamEndpointBuilderFactory.java} (80%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{ECSEndpointBuilderFactory.java => EtcdKeysEndpointBuilderFactory.java} (55%)
 rename core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{EtcdEndpointBuilderFactory.java => EtcdStatsEndpointBuilderFactory.java} (81%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{IgniteEventsEndpointBuilderFactory.java => EtcdWatchEndpointBuilderFactory.java} (53%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{IAMEndpointBuilderFactory.java => IAM2EndpointBuilderFactory.java} (71%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{KinesisEndpointBuilderFactory.java => Kinesis2EndpointBuilderFactory.java} (77%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{KinesisFirehoseEndpointBuilderFactory.java => KinesisFirehose2EndpointBuilderFactory.java} (69%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{LambdaEndpointBuilderFactory.java => Lambda2EndpointBuilderFactory.java} (71%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{SesEndpointBuilderFactory.java => Ses2EndpointBuilderFactory.java} (73%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{SnsEndpointBuilderFactory.java => Sns2EndpointBuilderFactory.java} (72%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{SparkEndpointBuilderFactory.java => SparkRestEndpointBuilderFactory.java} (85%)
 copy core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{SqsEndpointBuilderFactory.java => Sqs2EndpointBuilderFactory.java} (80%)
 rename core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/{XmlSignatureEndpointBuilderFactory.java => XmlSignerEndpointBuilderFactory.java} (57%)
 create mode 100644 core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/XmlVerifierEndpointBuilderFactory.java
 delete mode 100644 core/camel-xml-jaxp/src/generated/resources/META-INF/services/org/apache/camel/language.properties
 delete mode 100644 core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/DomConverterLoader.java
 delete mode 100644 core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StaxConverterLoader.java
 delete mode 100644 core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/StreamSourceConverterLoader.java
 delete mode 100644 core/camel-xml-jaxp/src/generated/resources/org/apache/camel/converter/jaxp/XmlConverterLoader.java
 delete mode 100644 core/camel-xml-jaxp/src/generated/resources/org/apache/camel/language/xtokenizer/xtokenize.json
 delete mode 100644 core/camel-xml-jaxp/src/generated/resources/org/apache/camel/util/xml/StreamSourceConverterLoader.java
 create mode 100644 tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
 create mode 100644 tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component3.json
 copy components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json => tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component4.json (50%)


[camel] 04/18: Regen

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

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

commit 17fc24b6ce32797016cff59a520cde489e12956d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 17:02:30 2020 +0100

    Regen
---
 .../camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java      | 4 ++--
 .../builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java      | 6 +++---
 .../camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java  | 6 +++---
 .../endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java        | 4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
index 39c717f..d5d580e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
@@ -413,8 +413,8 @@ public interface Ddb2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface Ddb2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
index 80ea1e7..67c45f3 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
@@ -856,15 +856,15 @@ public interface Ddb2StreamEndpointBuilderFactory {
         LATEST,
         AT_SEQUENCE_NUMBER,
         AFTER_SEQUENCE_NUMBER,
-        null;
+        UNKNOWN_TO_SDK_VERSION;
     }
 
     /**
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface Ddb2StreamBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
index d00eba3..ed8eb4e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Kinesis2EndpointBuilderFactory.java
@@ -1339,8 +1339,8 @@ public interface Kinesis2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     /**
@@ -1353,7 +1353,7 @@ public interface Kinesis2EndpointBuilderFactory {
         TRIM_HORIZON,
         LATEST,
         AT_TIMESTAMP,
-        null;
+        UNKNOWN_TO_SDK_VERSION;
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
index df5202c..463947c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehose2EndpointBuilderFactory.java
@@ -288,8 +288,8 @@ public interface KinesisFirehose2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface KinesisFirehose2Builders {


[camel] 07/18: Regen AWS components

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

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

commit 699ee0d72ca0f06343e12ba3ca5e8c77bfcd909d
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 17:56:38 2020 +0100

    Regen AWS components
---
 .../dsl/AWS2EC2EndpointBuilderFactory.java         |  4 +-
 .../dsl/CaffeineCacheEndpointBuilderFactory.java   |  4 +-
 .../CaffeineLoadCacheEndpointBuilderFactory.java   |  4 +-
 .../endpoint/dsl/Cw2EndpointBuilderFactory.java    |  4 +-
 .../endpoint/dsl/CwEndpointBuilderFactory.java     |  4 +-
 .../endpoint/dsl/DdbEndpointBuilderFactory.java    |  4 +-
 .../dsl/DdbStreamEndpointBuilderFactory.java       |  4 +-
 .../endpoint/dsl/EC2EndpointBuilderFactory.java    |  4 +-
 .../endpoint/dsl/ECS2EndpointBuilderFactory.java   |  4 +-
 .../endpoint/dsl/ECSEndpointBuilderFactory.java    |  4 +-
 .../endpoint/dsl/EKS2EndpointBuilderFactory.java   |  4 +-
 .../endpoint/dsl/EKSEndpointBuilderFactory.java    |  4 +-
 ...azelcastAtomicnumberEndpointBuilderFactory.java | 72 ++++++++++----------
 .../HazelcastInstanceEndpointBuilderFactory.java   | 72 ++++++++++----------
 .../dsl/HazelcastListEndpointBuilderFactory.java   | 72 ++++++++++----------
 .../dsl/HazelcastMapEndpointBuilderFactory.java    | 72 ++++++++++----------
 .../HazelcastMultimapEndpointBuilderFactory.java   | 72 ++++++++++----------
 .../dsl/HazelcastQueueEndpointBuilderFactory.java  | 76 +++++++++++-----------
 ...zelcastReplicatedmapEndpointBuilderFactory.java | 72 ++++++++++----------
 .../HazelcastRingbufferEndpointBuilderFactory.java | 72 ++++++++++----------
 .../dsl/HazelcastSedaEndpointBuilderFactory.java   | 72 ++++++++++----------
 .../dsl/HazelcastSetEndpointBuilderFactory.java    | 72 ++++++++++----------
 .../dsl/HazelcastTopicEndpointBuilderFactory.java  | 72 ++++++++++----------
 .../endpoint/dsl/IAM2EndpointBuilderFactory.java   |  4 +-
 .../endpoint/dsl/IAMEndpointBuilderFactory.java    |  4 +-
 .../endpoint/dsl/KMS2EndpointBuilderFactory.java   |  4 +-
 .../endpoint/dsl/KMSEndpointBuilderFactory.java    |  4 +-
 .../dsl/KinesisEndpointBuilderFactory.java         |  4 +-
 .../dsl/KinesisFirehoseEndpointBuilderFactory.java |  4 +-
 .../dsl/Lambda2EndpointBuilderFactory.java         |  4 +-
 .../endpoint/dsl/LambdaEndpointBuilderFactory.java |  4 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |  4 +-
 .../endpoint/dsl/MQEndpointBuilderFactory.java     |  4 +-
 .../endpoint/dsl/MSK2EndpointBuilderFactory.java   |  4 +-
 .../endpoint/dsl/MSKEndpointBuilderFactory.java    |  4 +-
 .../endpoint/dsl/S3EndpointBuilderFactory.java     |  4 +-
 .../endpoint/dsl/SdbEndpointBuilderFactory.java    |  4 +-
 .../endpoint/dsl/Ses2EndpointBuilderFactory.java   |  4 +-
 .../endpoint/dsl/SesEndpointBuilderFactory.java    |  4 +-
 .../endpoint/dsl/Sns2EndpointBuilderFactory.java   |  4 +-
 .../endpoint/dsl/SnsEndpointBuilderFactory.java    |  4 +-
 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java   |  4 +-
 .../endpoint/dsl/SqsEndpointBuilderFactory.java    |  4 +-
 .../dsl/Translate2EndpointBuilderFactory.java      |  4 +-
 .../dsl/TranslateEndpointBuilderFactory.java       |  4 +-
 45 files changed, 466 insertions(+), 466 deletions(-)

diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
index 52c59b3..c598f2e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
@@ -322,8 +322,8 @@ public interface AWS2EC2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface AWS2EC2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
index d4b89a6..4ea39d9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineCacheEndpointBuilderFactory.java
@@ -497,8 +497,8 @@ public interface CaffeineCacheEndpointBuilderFactory {
      * <code>org.apache.camel.component.caffeine.EvictionType</code> enum.
      */
     enum EvictionType {
-        size_based,
-        time_based;
+        SIZE_BASED,
+        TIME_BASED;
     }
 
     public interface CaffeineCacheBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
index a516898..a79b89b 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CaffeineLoadCacheEndpointBuilderFactory.java
@@ -505,8 +505,8 @@ public interface CaffeineLoadCacheEndpointBuilderFactory {
      * <code>org.apache.camel.component.caffeine.EvictionType</code> enum.
      */
     enum EvictionType {
-        size_based,
-        time_based;
+        SIZE_BASED,
+        TIME_BASED;
     }
 
     public interface CaffeineLoadCacheBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
index f35ab5e..57f1d10 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
@@ -336,8 +336,8 @@ public interface Cw2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface Cw2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
index 23962ef..78ca76e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CwEndpointBuilderFactory.java
@@ -334,8 +334,8 @@ public interface CwEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface CwBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
index 6085427..699677c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DdbEndpointBuilderFactory.java
@@ -410,8 +410,8 @@ public interface DdbEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface DdbBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
index c0ef478..e6738a4 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DdbStreamEndpointBuilderFactory.java
@@ -859,8 +859,8 @@ public interface DdbStreamEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface DdbStreamBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
index d6fde27..b42b71f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
@@ -317,8 +317,8 @@ public interface EC2EndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface EC2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
index 075357c..682971a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
@@ -305,8 +305,8 @@ public interface ECS2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface ECS2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
index e698895..5c53079 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECSEndpointBuilderFactory.java
@@ -304,8 +304,8 @@ public interface ECSEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface ECSBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
index dd07412..29b65dc 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
@@ -305,8 +305,8 @@ public interface EKS2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface EKS2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
index a1fea29..6e36bf8 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKSEndpointBuilderFactory.java
@@ -304,8 +304,8 @@ public interface EKSEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface EKSBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
index 4f032ff..ce3b7a9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastAtomicnumberEndpointBuilderFactory.java
@@ -229,42 +229,42 @@ public interface HazelcastAtomicnumberEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastAtomicnumberBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
index 822d06e..48a2d4d 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastInstanceEndpointBuilderFactory.java
@@ -284,42 +284,42 @@ public interface HazelcastInstanceEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastInstanceBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
index 501daa5..3b9f126 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastListEndpointBuilderFactory.java
@@ -627,42 +627,42 @@ public interface HazelcastListEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastListBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
index 405ee30..62995cc 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMapEndpointBuilderFactory.java
@@ -627,42 +627,42 @@ public interface HazelcastMapEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastMapBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
index f21a209..64e4f47 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastMultimapEndpointBuilderFactory.java
@@ -630,42 +630,42 @@ public interface HazelcastMultimapEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastMultimapBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
index b8beb16..d28e8f0 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastQueueEndpointBuilderFactory.java
@@ -707,42 +707,42 @@ public interface HazelcastQueueEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     /**
@@ -750,8 +750,8 @@ public interface HazelcastQueueEndpointBuilderFactory {
      * <code>org.apache.camel.component.hazelcast.queue.HazelcastQueueConsumerMode</code> enum.
      */
     enum HazelcastQueueConsumerMode {
-        listen,
-        poll;
+        LISTEN,
+        POLL;
     }
 
     public interface HazelcastQueueBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
index 61cc270..8dd85c8 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastReplicatedmapEndpointBuilderFactory.java
@@ -632,42 +632,42 @@ public interface HazelcastReplicatedmapEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastReplicatedmapBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
index ba34dce..d176f68 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastRingbufferEndpointBuilderFactory.java
@@ -229,42 +229,42 @@ public interface HazelcastRingbufferEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastRingbufferBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
index ae306d9..5f7e5d5 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
@@ -1051,42 +1051,42 @@ public interface HazelcastSedaEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastSedaBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
index fb20bca..7a76f49 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSetEndpointBuilderFactory.java
@@ -627,42 +627,42 @@ public interface HazelcastSetEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastSetBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
index db27da5..917b061 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastTopicEndpointBuilderFactory.java
@@ -701,42 +701,42 @@ public interface HazelcastTopicEndpointBuilderFactory {
      * enum.
      */
     enum HazelcastOperation {
-        put,
-        delete,
-        get,
-        update,
-        query,
-        getAll,
-        clear,
-        putIfAbsent,
-        allAll,
-        removeAll,
-        retainAll,
-        evict,
-        evictAll,
-        valueCount,
-        containsKey,
-        containsValue,
-        keySet,
-        removevalue,
-        increment,
-        decrement,
-        setvalue,
-        destroy,
-        compareAndSet,
-        getAndAdd,
-        add,
-        offer,
-        peek,
-        poll,
-        remainingCapacity,
-        drainTo,
-        removeIf,
-        take,
-        publish,
-        readOnceHeal,
-        readOnceTail,
-        capacity;
+        PUT,
+        DELETE,
+        GET,
+        UPDATE,
+        QUERY,
+        GET_ALL,
+        CLEAR,
+        PUT_IF_ABSENT,
+        ADD_ALL,
+        REMOVE_ALL,
+        RETAIN_ALL,
+        EVICT,
+        EVICT_ALL,
+        VALUE_COUNT,
+        CONTAINS_KEY,
+        CONTAINS_VALUE,
+        GET_KEYS,
+        REMOVE_VALUE,
+        INCREMENT,
+        DECREMENT,
+        SET_VALUE,
+        DESTROY,
+        COMPARE_AND_SET,
+        GET_AND_ADD,
+        ADD,
+        OFFER,
+        PEEK,
+        POLL,
+        REMAINING_CAPACITY,
+        DRAIN_TO,
+        REMOVE_IF,
+        TAKE,
+        PUBLISH,
+        READ_ONCE_HEAD,
+        READ_ONCE_TAIL,
+        CAPACITY;
     }
 
     public interface HazelcastTopicBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
index d28caea..c55d8a9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
@@ -314,8 +314,8 @@ public interface IAM2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface IAM2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
index 69a01b0..45d8a7f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAMEndpointBuilderFactory.java
@@ -313,8 +313,8 @@ public interface IAMEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface IAMBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
index 38d802a..bf6bcdf 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMS2EndpointBuilderFactory.java
@@ -307,8 +307,8 @@ public interface KMS2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface KMS2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
index ffc4167..a58d2e2 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KMSEndpointBuilderFactory.java
@@ -305,8 +305,8 @@ public interface KMSEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface KMSBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java
index 58054c2..e3dd085 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisEndpointBuilderFactory.java
@@ -1332,8 +1332,8 @@ public interface KinesisEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
index c667b12..f4e4b1c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KinesisFirehoseEndpointBuilderFactory.java
@@ -285,8 +285,8 @@ public interface KinesisFirehoseEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface KinesisFirehoseBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Lambda2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Lambda2EndpointBuilderFactory.java
index e1b1ffe..9b1c4f9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Lambda2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Lambda2EndpointBuilderFactory.java
@@ -331,8 +331,8 @@ public interface Lambda2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface Lambda2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
index 02be69f..f2e5e58 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/LambdaEndpointBuilderFactory.java
@@ -325,8 +325,8 @@ public interface LambdaEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface LambdaBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java
index f41d2bc..7e64566 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQ2EndpointBuilderFactory.java
@@ -309,8 +309,8 @@ public interface MQ2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface MQ2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
index a64c4f5..13ae791 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MQEndpointBuilderFactory.java
@@ -308,8 +308,8 @@ public interface MQEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface MQBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSK2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSK2EndpointBuilderFactory.java
index c1e19e0..1ba3e05 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSK2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSK2EndpointBuilderFactory.java
@@ -305,8 +305,8 @@ public interface MSK2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface MSK2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
index cf08db8..11c1a81 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MSKEndpointBuilderFactory.java
@@ -304,8 +304,8 @@ public interface MSKEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface MSKBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
index adb42b3..8e1ca5f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
@@ -2402,8 +2402,8 @@ public interface S3EndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
index 158b62e..fbff30f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SdbEndpointBuilderFactory.java
@@ -361,8 +361,8 @@ public interface SdbEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface SdbBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ses2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ses2EndpointBuilderFactory.java
index 15c38d9..24cfc1d 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ses2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ses2EndpointBuilderFactory.java
@@ -347,8 +347,8 @@ public interface Ses2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface Ses2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
index 6c7bea3..a09d6b8 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SesEndpointBuilderFactory.java
@@ -345,8 +345,8 @@ public interface SesEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface SesBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
index 3d2ce21..c6f0f49 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sns2EndpointBuilderFactory.java
@@ -430,8 +430,8 @@ public interface Sns2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface Sns2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
index 077dce1..abfa925 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SnsEndpointBuilderFactory.java
@@ -453,8 +453,8 @@ public interface SnsEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface SnsBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
index 1d4c150..25f44ca 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
@@ -2362,8 +2362,8 @@ public interface Sqs2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
index 1e67dda..bb429fa 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
@@ -2357,8 +2357,8 @@ public interface SqsEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
index f28fa60..8653ecd 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
@@ -358,8 +358,8 @@ public interface Translate2EndpointBuilderFactory {
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface Translate2Builders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
index 04a8273..88d0ebb 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TranslateEndpointBuilderFactory.java
@@ -354,8 +354,8 @@ public interface TranslateEndpointBuilderFactory {
      * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
      */
     enum Protocol {
-        http,
-        https;
+        HTTP,
+        HTTPS;
     }
 
     public interface TranslateBuilders {


[camel] 03/18: Extract languages into camel-core-languages so that we don't have a build cycle between camel-base / camel-core-engine

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

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

commit 60f4190eb3b844039462455040f471ea139c3ca5
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 17:02:17 2020 +0100

    Extract languages into camel-core-languages so that we don't have a build cycle between camel-base / camel-core-engine
---
 components/camel-ftp/pom.xml                         |  5 +++++
 components/camel-hdfs/pom.xml                        |  5 +++++
 components/camel-jcache/pom.xml                      |  5 +++++
 components/camel-jpa/pom.xml                         |  4 ++++
 core/camel-allcomponents/pom.xml                     |  4 ++++
 core/camel-base/pom.xml                              |  4 ----
 .../java/org/apache/camel/builder/SimpleBuilder.java |  3 +--
 .../camel/model/language/TokenizerExpression.java    |  3 +--
 .../reifier/language/TokenizerExpressionReifier.java |  1 -
 core/{camel-base => camel-core-languages}/pom.xml    | 20 +++-----------------
 .../services/org/apache/camel/language.properties    |  4 ++--
 .../services/org/apache/camel/language/constant      |  2 ++
 .../org/apache/camel/language/exchangeProperty       |  2 ++
 .../META-INF/services/org/apache/camel/language/file |  2 ++
 .../services/org/apache/camel/language/header        |  2 ++
 .../META-INF/services/org/apache/camel/language/ref  |  2 ++
 .../services/org/apache/camel/language/simple        |  2 ++
 .../services/org/apache/camel/language/tokenize      |  2 ++
 .../org/apache/camel/language/constant/constant.json |  2 +-
 .../org/apache/camel/language/header/header.json     |  2 +-
 .../camel/language/property/exchangeProperty.json    |  2 +-
 .../resources/org/apache/camel/language/ref/ref.json |  2 +-
 .../org/apache/camel/language/simple/file.json       |  2 +-
 .../org/apache/camel/language/simple/simple.json     |  2 +-
 .../apache/camel/language/tokenizer/tokenize.json    |  2 +-
 .../src/main/docs/constant-language.adoc             |  0
 .../src/main/docs/exchangeProperty-language.adoc     |  0
 .../src/main/docs/file-language.adoc                 |  0
 .../src/main/docs/header-language.adoc               |  0
 .../src/main/docs/properties-component.adoc          |  0
 .../src/main/docs/ref-language.adoc                  |  0
 .../src/main/docs/simple-language.adoc               |  0
 .../src/main/docs/tokenize-language.adoc             |  0
 .../camel/language/constant/ConstantLanguage.java    |  0
 .../org/apache/camel/language/constant/package.html  |  0
 .../apache/camel/language/header/HeaderLanguage.java |  0
 .../org/apache/camel/language/header/package.html    |  0
 .../main/java/org/apache/camel/language/package.html |  0
 .../language/property/ExchangePropertyLanguage.java  |  0
 .../org/apache/camel/language/property/package.html  |  0
 .../org/apache/camel/language/ref/RefLanguage.java   |  0
 .../java/org/apache/camel/language/ref/package.html  |  0
 .../camel/language/simple/BaseSimpleParser.java      |  0
 .../apache/camel/language/simple/FileLanguage.java   |  0
 .../org/apache/camel/language/simple/Simple.java     |  0
 .../language/simple/SimpleExpressionBuilder.java     |  0
 .../language/simple/SimpleExpressionParser.java      |  0
 .../apache/camel/language/simple/SimpleLanguage.java |  0
 .../camel/language/simple/SimplePredicateParser.java |  0
 .../camel/language/simple/SimpleTokenizer.java       |  0
 .../camel/language/simple/ast/BaseSimpleNode.java    |  0
 .../camel/language/simple/ast/BinaryExpression.java  |  0
 .../org/apache/camel/language/simple/ast/Block.java  |  0
 .../apache/camel/language/simple/ast/BlockEnd.java   |  0
 .../apache/camel/language/simple/ast/BlockStart.java |  0
 .../camel/language/simple/ast/CompositeNodes.java    |  0
 .../camel/language/simple/ast/DoubleQuoteEnd.java    |  0
 .../camel/language/simple/ast/DoubleQuoteStart.java  |  0
 .../camel/language/simple/ast/LiteralExpression.java |  0
 .../camel/language/simple/ast/LiteralNode.java       |  0
 .../camel/language/simple/ast/LogicalExpression.java |  0
 .../camel/language/simple/ast/NullExpression.java    |  0
 .../camel/language/simple/ast/SimpleFunctionEnd.java |  0
 .../simple/ast/SimpleFunctionExpression.java         |  0
 .../language/simple/ast/SimpleFunctionStart.java     |  0
 .../apache/camel/language/simple/ast/SimpleNode.java |  0
 .../camel/language/simple/ast/SingleQuoteEnd.java    |  0
 .../camel/language/simple/ast/SingleQuoteStart.java  |  0
 .../camel/language/simple/ast/UnaryExpression.java   |  0
 .../apache/camel/language/simple/ast/package.html    |  0
 .../org/apache/camel/language/simple/package.html    |  0
 .../language/simple/types/BinaryOperatorType.java    |  0
 .../language/simple/types/LogicalOperatorType.java   |  0
 .../simple/types/SimpleIllegalSyntaxException.java   |  0
 .../language/simple/types/SimpleParserException.java |  0
 .../camel/language/simple/types/SimpleToken.java     |  0
 .../camel/language/simple/types/SimpleTokenType.java |  0
 .../camel/language/simple/types/TokenType.java       |  0
 .../language/simple/types/UnaryOperatorType.java     |  0
 .../apache/camel/language/simple/types/package.html  |  0
 .../camel/language/tokenizer/TokenizeLanguage.java   |  0
 .../org/apache/camel/language/tokenizer/package.html |  0
 .../org/apache/camel/properties-component-factory    | 18 ++++++++++++++++++
 core/camel-core-osgi/pom.xml                         |  5 +++++
 core/camel-core/pom.xml                              |  4 ++++
 core/pom.xml                                         |  1 +
 parent/pom.xml                                       |  5 +++++
 .../camel/maven/packaging/EndpointDslMojo.java       |  2 +-
 88 files changed, 85 insertions(+), 36 deletions(-)

diff --git a/components/camel-ftp/pom.xml b/components/camel-ftp/pom.xml
index 2bfa959..5d2ccc5 100644
--- a/components/camel-ftp/pom.xml
+++ b/components/camel-ftp/pom.xml
@@ -66,6 +66,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core-languages</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
             <artifactId>camel-ssh</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/components/camel-hdfs/pom.xml b/components/camel-hdfs/pom.xml
index f56b047..6ffd8ae 100644
--- a/components/camel-hdfs/pom.xml
+++ b/components/camel-hdfs/pom.xml
@@ -133,6 +133,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core-languages</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <scope>test</scope>
diff --git a/components/camel-jcache/pom.xml b/components/camel-jcache/pom.xml
index 940be68..81ff9fb 100644
--- a/components/camel-jcache/pom.xml
+++ b/components/camel-jcache/pom.xml
@@ -66,6 +66,11 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core-languages</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
             <version>${hazelcast-version}</version>
diff --git a/components/camel-jpa/pom.xml b/components/camel-jpa/pom.xml
index 10fd32f..291af52 100644
--- a/components/camel-jpa/pom.xml
+++ b/components/camel-jpa/pom.xml
@@ -50,6 +50,10 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core-languages</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
             <artifactId>camel-spring</artifactId>
         </dependency>
         <dependency>
diff --git a/core/camel-allcomponents/pom.xml b/core/camel-allcomponents/pom.xml
index 3347fd4..64d3bc9 100644
--- a/core/camel-allcomponents/pom.xml
+++ b/core/camel-allcomponents/pom.xml
@@ -324,6 +324,10 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-core-languages</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-couchbase</artifactId>
 		</dependency>
 		<dependency>
diff --git a/core/camel-base/pom.xml b/core/camel-base/pom.xml
index 6546846..d2db70b 100644
--- a/core/camel-base/pom.xml
+++ b/core/camel-base/pom.xml
@@ -33,10 +33,6 @@
     <name>Camel :: Base</name>
     <description>The Base Camel Framework</description>
 
-    <properties>
-        <camel-prepare-component>true</camel-prepare-component>
-    </properties>
-
     <dependencies>
 
         <!-- required dependencies by camel-base -->
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java b/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
index ce43eab..894e5e6 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/builder/SimpleBuilder.java
@@ -21,7 +21,6 @@ import org.apache.camel.CamelExecutionException;
 import org.apache.camel.Exchange;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
-import org.apache.camel.language.simple.Simple;
 import org.apache.camel.spi.ExpressionResultTypeAware;
 import org.apache.camel.spi.Language;
 import org.apache.camel.spi.PropertyConfigurer;
@@ -30,7 +29,7 @@ import org.apache.camel.support.ScriptHelper;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
 /**
- * Creates an {@link Simple} language builder.
+ * Creates an {@link org.apache.camel.language.simple.Simple} language builder.
  * <p/>
  * This builder is available in the Java DSL from the {@link RouteBuilder} which
  * means that using simple language for {@link Expression}s or
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
index bd9e4ed..adba172 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
@@ -21,14 +21,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlRootElement;
 
-import org.apache.camel.language.tokenizer.TokenizeLanguage;
 import org.apache.camel.spi.Metadata;
 
 /**
  * To use Camel message body or header with a tokenizer in Camel expressions or
  * predicates.
  *
- * @see TokenizeLanguage
+ * @see org.apache.camel.language.tokenizer.TokenizeLanguage
  */
 @Metadata(firstVersion = "2.0.0", label = "language,core", title = "Tokenize")
 @XmlRootElement(name = "tokenize")
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
index f56ba1c..ef08490 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/language/TokenizerExpressionReifier.java
@@ -22,7 +22,6 @@ import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Expression;
 import org.apache.camel.Predicate;
-import org.apache.camel.language.tokenizer.TokenizeLanguage;
 import org.apache.camel.model.language.ExpressionDefinition;
 import org.apache.camel.model.language.TokenizerExpression;
 import org.apache.camel.spi.Language;
diff --git a/core/camel-base/pom.xml b/core/camel-core-languages/pom.xml
similarity index 72%
copy from core/camel-base/pom.xml
copy to core/camel-core-languages/pom.xml
index 6546846..5f2f403 100644
--- a/core/camel-base/pom.xml
+++ b/core/camel-core-languages/pom.xml
@@ -27,10 +27,10 @@
         <relativePath>..</relativePath>
     </parent>
 
-    <artifactId>camel-base</artifactId>
+    <artifactId>camel-core-languages</artifactId>
     <packaging>jar</packaging>
 
-    <name>Camel :: Base</name>
+    <name>Camel :: Core Languages</name>
     <description>The Base Camel Framework</description>
 
     <properties>
@@ -39,25 +39,11 @@
 
     <dependencies>
 
-        <!-- required dependencies by camel-base -->
         <dependency>
             <groupId>org.apache.camel</groupId>
-            <artifactId>camel-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-management-api</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-support</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-util</artifactId>
+            <artifactId>camel-core-engine</artifactId>
         </dependency>
 
-        <!-- required logging api dependency by camel-base -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
similarity index 76%
rename from core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
rename to core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
index 52fc654..73e589c 100644
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
+++ b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language.properties
@@ -1,7 +1,7 @@
 # Generated by camel build tools - do NOT edit this file!
 languages=constant exchangeProperty file header ref simple tokenize
 groupId=org.apache.camel
-artifactId=camel-base
+artifactId=camel-core-languages
 version=3.2.0-SNAPSHOT
-projectName=Camel :: Base
+projectName=Camel :: Core Languages
 projectDescription=The Base Camel Framework
diff --git a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/constant b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/constant
new file mode 100644
index 0000000..4610522
--- /dev/null
+++ b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/constant
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.constant.ConstantLanguage
diff --git a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty
new file mode 100644
index 0000000..a67aa4c
--- /dev/null
+++ b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.property.ExchangePropertyLanguage
diff --git a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/file b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/file
new file mode 100644
index 0000000..bf95732
--- /dev/null
+++ b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/file
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.simple.FileLanguage
diff --git a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/header b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/header
new file mode 100644
index 0000000..a608af5
--- /dev/null
+++ b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/header
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.header.HeaderLanguage
diff --git a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/ref b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/ref
new file mode 100644
index 0000000..74daf84
--- /dev/null
+++ b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/ref
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.ref.RefLanguage
diff --git a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/simple b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/simple
new file mode 100644
index 0000000..4b84522
--- /dev/null
+++ b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/simple
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.simple.SimpleLanguage
diff --git a/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize
new file mode 100644
index 0000000..1c2b127
--- /dev/null
+++ b/core/camel-core-languages/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize
@@ -0,0 +1,2 @@
+# Generated by camel build tools - do NOT edit this file!
+class=org.apache.camel.language.tokenizer.TokenizeLanguage
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/constant/constant.json
similarity index 97%
rename from core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
rename to core/camel-core-languages/src/generated/resources/org/apache/camel/language/constant/constant.json
index f91599a..3c9ea71 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
+++ b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/constant/constant.json
@@ -12,7 +12,7 @@
     "javaType": "org.apache.camel.language.constant.ConstantLanguage",
     "modelJavaType": "org.apache.camel.model.language.ConstantExpression",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-base",
+    "artifactId": "camel-core-languages",
     "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/header/header.json
similarity index 96%
rename from core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
rename to core/camel-core-languages/src/generated/resources/org/apache/camel/language/header/header.json
index 4c67e3e..0fc1356 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
+++ b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/header/header.json
@@ -12,7 +12,7 @@
     "javaType": "org.apache.camel.language.header.HeaderLanguage",
     "modelJavaType": "org.apache.camel.model.language.HeaderExpression",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-base",
+    "artifactId": "camel-core-languages",
     "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
similarity index 96%
rename from core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
rename to core/camel-core-languages/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
index da11bca..280a3d4 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
+++ b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
@@ -12,7 +12,7 @@
     "javaType": "org.apache.camel.language.property.ExchangePropertyLanguage",
     "modelJavaType": "org.apache.camel.model.language.ExchangePropertyExpression",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-base",
+    "artifactId": "camel-core-languages",
     "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/ref/ref.json
similarity index 96%
rename from core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
rename to core/camel-core-languages/src/generated/resources/org/apache/camel/language/ref/ref.json
index 78e820c..34b1a9f 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
+++ b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/ref/ref.json
@@ -12,7 +12,7 @@
     "javaType": "org.apache.camel.language.ref.RefLanguage",
     "modelJavaType": "org.apache.camel.model.language.RefExpression",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-base",
+    "artifactId": "camel-core-languages",
     "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/file.json
similarity index 97%
rename from core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
rename to core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/file.json
index 02918b4..4d824d8 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
+++ b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/file.json
@@ -12,7 +12,7 @@
     "javaType": "org.apache.camel.language.simple.FileLanguage",
     "modelJavaType": "org.apache.camel.model.language.SimpleExpression",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-base",
+    "artifactId": "camel-core-languages",
     "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/simple.json
similarity index 97%
rename from core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
rename to core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/simple.json
index 93453d12..5a179cf 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
+++ b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/simple/simple.json
@@ -12,7 +12,7 @@
     "javaType": "org.apache.camel.language.simple.SimpleLanguage",
     "modelJavaType": "org.apache.camel.model.language.SimpleExpression",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-base",
+    "artifactId": "camel-core-languages",
     "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
similarity index 99%
rename from core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
rename to core/camel-core-languages/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
index ec3c7ff..4bec7f5 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
+++ b/core/camel-core-languages/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
@@ -12,7 +12,7 @@
     "javaType": "org.apache.camel.language.tokenizer.TokenizeLanguage",
     "modelJavaType": "org.apache.camel.model.language.TokenizerExpression",
     "groupId": "org.apache.camel",
-    "artifactId": "camel-base",
+    "artifactId": "camel-core-languages",
     "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
diff --git a/core/camel-base/src/main/docs/constant-language.adoc b/core/camel-core-languages/src/main/docs/constant-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/constant-language.adoc
rename to core/camel-core-languages/src/main/docs/constant-language.adoc
diff --git a/core/camel-base/src/main/docs/exchangeProperty-language.adoc b/core/camel-core-languages/src/main/docs/exchangeProperty-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/exchangeProperty-language.adoc
rename to core/camel-core-languages/src/main/docs/exchangeProperty-language.adoc
diff --git a/core/camel-base/src/main/docs/file-language.adoc b/core/camel-core-languages/src/main/docs/file-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/file-language.adoc
rename to core/camel-core-languages/src/main/docs/file-language.adoc
diff --git a/core/camel-base/src/main/docs/header-language.adoc b/core/camel-core-languages/src/main/docs/header-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/header-language.adoc
rename to core/camel-core-languages/src/main/docs/header-language.adoc
diff --git a/core/camel-base/src/main/docs/properties-component.adoc b/core/camel-core-languages/src/main/docs/properties-component.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/properties-component.adoc
rename to core/camel-core-languages/src/main/docs/properties-component.adoc
diff --git a/core/camel-base/src/main/docs/ref-language.adoc b/core/camel-core-languages/src/main/docs/ref-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/ref-language.adoc
rename to core/camel-core-languages/src/main/docs/ref-language.adoc
diff --git a/core/camel-base/src/main/docs/simple-language.adoc b/core/camel-core-languages/src/main/docs/simple-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/simple-language.adoc
rename to core/camel-core-languages/src/main/docs/simple-language.adoc
diff --git a/core/camel-base/src/main/docs/tokenize-language.adoc b/core/camel-core-languages/src/main/docs/tokenize-language.adoc
similarity index 100%
rename from core/camel-base/src/main/docs/tokenize-language.adoc
rename to core/camel-core-languages/src/main/docs/tokenize-language.adoc
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/constant/ConstantLanguage.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/constant/package.html b/core/camel-core-languages/src/main/java/org/apache/camel/language/constant/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/constant/package.html
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/constant/package.html
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/header/HeaderLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/header/HeaderLanguage.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/header/package.html b/core/camel-core-languages/src/main/java/org/apache/camel/language/header/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/header/package.html
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/header/package.html
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/package.html b/core/camel-core-languages/src/main/java/org/apache/camel/language/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/package.html
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/package.html
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/property/ExchangePropertyLanguage.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/property/package.html b/core/camel-core-languages/src/main/java/org/apache/camel/language/property/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/property/package.html
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/property/package.html
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/ref/RefLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/ref/RefLanguage.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/ref/RefLanguage.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/ref/package.html b/core/camel-core-languages/src/main/java/org/apache/camel/language/ref/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/ref/package.html
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/ref/package.html
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/BaseSimpleParser.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/FileLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/FileLanguage.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/FileLanguage.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/FileLanguage.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/Simple.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/Simple.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/Simple.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/Simple.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionBuilder.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleExpressionParser.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleLanguage.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimplePredicateParser.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/SimpleTokenizer.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BaseSimpleNode.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BinaryExpression.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/Block.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/Block.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/Block.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/Block.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BlockEnd.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/BlockStart.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/CompositeNodes.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteEnd.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/DoubleQuoteStart.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralExpression.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LiteralNode.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/LogicalExpression.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/NullExpression.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionEnd.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionExpression.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleFunctionStart.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SimpleNode.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteEnd.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/SingleQuoteStart.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/UnaryExpression.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/ast/package.html b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/ast/package.html
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/ast/package.html
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/package.html b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/package.html
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/package.html
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/BinaryOperatorType.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/LogicalOperatorType.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleIllegalSyntaxException.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleParserException.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleToken.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/SimpleTokenType.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/TokenType.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/TokenType.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/types/TokenType.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/TokenType.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/UnaryOperatorType.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/simple/types/package.html b/core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/simple/types/package.html
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/simple/types/package.html
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/TokenizeLanguage.java
diff --git a/core/camel-base/src/main/java/org/apache/camel/language/tokenizer/package.html b/core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/package.html
similarity index 100%
rename from core/camel-base/src/main/java/org/apache/camel/language/tokenizer/package.html
rename to core/camel-core-languages/src/main/java/org/apache/camel/language/tokenizer/package.html
diff --git a/core/camel-core-languages/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory b/core/camel-core-languages/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
new file mode 100644
index 0000000..9f34c8f
--- /dev/null
+++ b/core/camel-core-languages/src/main/resources/META-INF/services/org/apache/camel/properties-component-factory
@@ -0,0 +1,18 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+class=org.apache.camel.component.properties.PropertiesComponent
diff --git a/core/camel-core-osgi/pom.xml b/core/camel-core-osgi/pom.xml
index 462f74c..85f790f 100644
--- a/core/camel-core-osgi/pom.xml
+++ b/core/camel-core-osgi/pom.xml
@@ -68,6 +68,11 @@
         <!-- for testing -->
         <dependency>
             <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core-languages</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
             <artifactId>camel-file</artifactId>
             <scope>test</scope>
         </dependency>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 2f09da1..d27de25 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -39,6 +39,10 @@
             <groupId>org.apache.camel</groupId>
             <artifactId>camel-core-engine</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core-languages</artifactId>
+        </dependency>
 
         <!-- core components -->
         <dependency>
diff --git a/core/pom.xml b/core/pom.xml
index 6832277..01a5f37 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -45,6 +45,7 @@
         <module>camel-base</module>
         <module>camel-xml-jaxp</module>
         <module>camel-core-engine</module>
+        <module>camel-core-languages</module>
         <module>camel-xml-io</module>
         <module>camel-xml-jaxb</module>
         <module>camel-core</module>
diff --git a/parent/pom.xml b/parent/pom.xml
index 15a8515..bb1714a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -805,6 +805,11 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.camel</groupId>
+                <artifactId>camel-core-languages</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.camel</groupId>
                 <artifactId>camel-endpointdsl</artifactId>
                 <version>${project.version}</version>
             </dependency>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index d62283e..8ccc582 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -824,7 +824,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                 enumClass.getJavaDoc().setText("Proxy enum for <code>" + type + "</code> enum.");
                 enumClasses.put(enumClassName, enumClass);
                 for (Object value : loadClass(type).getEnumConstants()) {
-                    enumClass.addValue(value.toString().replace('.', '_').replace('-', '_'));
+                    enumClass.addValue((((Enum<?>) value).name()).replace('.', '_').replace('-', '_'));
                 }
             }
             type = javaClass.getPackage() + "." + javaClass.getName() + "$" + enumClassName;


[camel] 05/18: Fix repositories

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

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

commit 9823bec03d8e2600656a1c2dc200448873c2d1b0
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 17:02:49 2020 +0100

    Fix repositories
---
 components/camel-ipfs/pom.xml    | 14 --------------
 components/camel-jira/pom.xml    |  6 ------
 components/camel-weka/pom.xml    | 16 +---------------
 core/camel-allcomponents/pom.xml |  8 --------
 core/camel-componentdsl/pom.xml  |  8 --------
 core/camel-endpointdsl/pom.xml   |  7 -------
 docs/pom.xml                     |  8 --------
 pom.xml                          | 35 +++++++++++++++++++++++++++++++++++
 8 files changed, 36 insertions(+), 66 deletions(-)

diff --git a/components/camel-ipfs/pom.xml b/components/camel-ipfs/pom.xml
index 1bfddbf..baf2374 100644
--- a/components/camel-ipfs/pom.xml
+++ b/components/camel-ipfs/pom.xml
@@ -63,20 +63,6 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>jboss.thirdparty</id>
-            <name>JBoss Thirdparty Repository</name>
-            <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
     <build>
         <plugins>
             <plugin>
diff --git a/components/camel-jira/pom.xml b/components/camel-jira/pom.xml
index b34761e..aa4225f 100644
--- a/components/camel-jira/pom.xml
+++ b/components/camel-jira/pom.xml
@@ -116,10 +116,4 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>atlassian-public</id>
-            <url>https://packages.atlassian.com/maven-external</url>
-        </repository>
-    </repositories>
 </project>
diff --git a/components/camel-weka/pom.xml b/components/camel-weka/pom.xml
index 525aec8..7ec92cd 100644
--- a/components/camel-weka/pom.xml
+++ b/components/camel-weka/pom.xml
@@ -76,21 +76,7 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
-    <repositories>
-        <repository>
-            <id>jboss.thirdparty</id>
-            <name>JBoss Thirdparty Repository</name>
-            <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-        </repository>
-    </repositories>
-
+    
     <build>
         <plugins>
             <plugin>
diff --git a/core/camel-allcomponents/pom.xml b/core/camel-allcomponents/pom.xml
index 64d3bc9..c5deeff 100644
--- a/core/camel-allcomponents/pom.xml
+++ b/core/camel-allcomponents/pom.xml
@@ -1232,12 +1232,4 @@
 		</dependency>
 	</dependencies>
 
-    <!-- camel-jira -->
-    <repositories>
-        <repository>
-            <id>atlassian-public</id>
-            <url>https://packages.atlassian.com/maven-external</url>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/core/camel-componentdsl/pom.xml b/core/camel-componentdsl/pom.xml
index a70cb96..c715cbf 100644
--- a/core/camel-componentdsl/pom.xml
+++ b/core/camel-componentdsl/pom.xml
@@ -103,12 +103,4 @@
         </dependency>
     </dependencies>
 
-    <!-- camel-jira -->
-    <repositories>
-        <repository>
-            <id>atlassian-public</id>
-            <url>https://packages.atlassian.com/maven-external</url>
-        </repository>
-    </repositories>
-
 </project>
\ No newline at end of file
diff --git a/core/camel-endpointdsl/pom.xml b/core/camel-endpointdsl/pom.xml
index f4c521e..72cc92e 100644
--- a/core/camel-endpointdsl/pom.xml
+++ b/core/camel-endpointdsl/pom.xml
@@ -127,11 +127,4 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>atlassian-public</id>
-            <url>https://packages.atlassian.com/maven-external</url>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/docs/pom.xml b/docs/pom.xml
index a4878a9..f80c458 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -107,12 +107,4 @@
         </plugins>
     </build>
 
-    <!-- camel-jira -->
-    <repositories>
-        <repository>
-            <id>atlassian-public</id>
-            <url>https://packages.atlassian.com/maven-external</url>
-        </repository>
-    </repositories>
-
 </project>
diff --git a/pom.xml b/pom.xml
index 73a1e49..c61b582 100644
--- a/pom.xml
+++ b/pom.xml
@@ -132,6 +132,41 @@
     <!-- Comment out the snapshot repositories as we don't need them now -->
     <repositories>
         <repository>
+            <id>central</id>
+            <url>https://repo1.maven.org/maven2/</url>
+            <name>Maven Central</name>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <!-- camel-jira -->
+        <repository>
+            <id>atlassian-public</id>
+            <url>https://packages.atlassian.com/maven-external</url>
+            <name>Atlassian Public Repo</name>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <!-- camel-ipfs and camel-weka -->
+        <repository>
+            <id>jboss.thirdparty</id>
+            <name>JBoss Thirdparty Repository</name>
+            <url>https://repository.jboss.org/nexus/service/local/repositories/thirdparty-releases/content/</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+            <releases>
+                <enabled>true</enabled>
+            </releases>
+        </repository>
+        <repository>
             <id>apache.snapshots</id>
             <url>https://repository.apache.org/snapshots/</url>
             <name>Apache Snapshot Repo</name>


[camel] 18/18: [CAMEL-14628] Make sure the project can build after removing all generated sources

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

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

commit 25a0232647002a759eb78d41154ba428e45679ce
Merge: d1b3d43 9d156e7
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 3 07:31:21 2020 +0100

    [CAMEL-14628] Make sure the project can build after removing all generated sources

 .../component/servlet/DefaultHttpRegistry.java     | 72 +++++++++++++---------
 .../modules/ROOT/pages/book-getting-started.adoc   |  2 +-
 2 files changed, 44 insertions(+), 30 deletions(-)


[camel] 01/18: [CAMEL-14628] Make sure the project can build after removing all generated sources

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

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

commit 669b8acf36a5d2e559e86fed2a86a99dcfc45cfa
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 08:26:45 2020 +0100

    [CAMEL-14628] Make sure the project can build after removing all generated sources
---
 components/pom.xml                                 | 12 +++
 core/camel-base/pom.xml                            |  4 +
 core/camel-endpointdsl/pom.xml                     | 23 ++++++
 core/camel-main/pom.xml                            |  2 -
 core/camel-xml-io/pom.xml                          | 16 ++++
 core/pom.xml                                       | 12 +++
 .../camel/maven/packaging/EndpointDslMojo.java     | 96 +++++++++++++++-------
 .../maven/packaging/PrepareCamelMainMojo.java      | 31 +++----
 .../TypeConverterLoaderGeneratorMojo.java          |  3 +
 .../component/ComponentsDslMetadataRegistry.java   |  7 +-
 10 files changed, 157 insertions(+), 49 deletions(-)

diff --git a/components/pom.xml b/components/pom.xml
index e52f56e..490bbde 100644
--- a/components/pom.xml
+++ b/components/pom.xml
@@ -406,6 +406,18 @@
                 </executions>
             </plugin>
             <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>recompile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <phase>process-classes</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <executions>
diff --git a/core/camel-base/pom.xml b/core/camel-base/pom.xml
index d2db70b..6546846 100644
--- a/core/camel-base/pom.xml
+++ b/core/camel-base/pom.xml
@@ -33,6 +33,10 @@
     <name>Camel :: Base</name>
     <description>The Base Camel Framework</description>
 
+    <properties>
+        <camel-prepare-component>true</camel-prepare-component>
+    </properties>
+
     <dependencies>
 
         <!-- required dependencies by camel-base -->
diff --git a/core/camel-endpointdsl/pom.xml b/core/camel-endpointdsl/pom.xml
index 7dbfff9..f4c521e 100644
--- a/core/camel-endpointdsl/pom.xml
+++ b/core/camel-endpointdsl/pom.xml
@@ -111,4 +111,27 @@
 
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <!-- The non generated code depends on the generated code,
+                     so skip the first compilation phase -->
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <repositories>
+        <repository>
+            <id>atlassian-public</id>
+            <url>https://packages.atlassian.com/maven-external</url>
+        </repository>
+    </repositories>
+
 </project>
diff --git a/core/camel-main/pom.xml b/core/camel-main/pom.xml
index cfbde14..62e2c42 100644
--- a/core/camel-main/pom.xml
+++ b/core/camel-main/pom.xml
@@ -34,8 +34,6 @@
     <properties>
         <firstVersion>3.0</firstVersion>
         <label>core</label>
-
-        <camel-generate-main>true</camel-generate-main>
     </properties>
 
 
diff --git a/core/camel-xml-io/pom.xml b/core/camel-xml-io/pom.xml
index a18175f..59cf830 100644
--- a/core/camel-xml-io/pom.xml
+++ b/core/camel-xml-io/pom.xml
@@ -55,4 +55,20 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <!-- The non generated code depends on the generated code,
+                     so skip the first compilation phase -->
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>default-compile</id>
+                        <phase>none</phase>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/core/pom.xml b/core/pom.xml
index f6599a6..6832277 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -77,6 +77,18 @@
                 </executions>
             </plugin>
             <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>recompile</id>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
+                        <phase>process-classes</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
                 <executions>
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index ba85056..d62283e 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -38,6 +38,7 @@ import java.util.stream.Collectors;
 
 import javax.annotation.Generated;
 
+import org.apache.camel.maven.packaging.dsl.component.ComponentsDslMetadataRegistry;
 import org.apache.camel.maven.packaging.generics.GenericsUtil;
 import org.apache.camel.spi.UriEndpoint;
 import org.apache.camel.spi.UriParam;
@@ -52,7 +53,6 @@ import org.apache.camel.tooling.util.srcgen.GenericType;
 import org.apache.camel.tooling.util.srcgen.GenericType.BoundType;
 import org.apache.camel.tooling.util.srcgen.JavaClass;
 import org.apache.camel.tooling.util.srcgen.Method;
-import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
@@ -63,6 +63,8 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.MavenProjectHelper;
 import org.sonatype.plexus.build.incremental.BuildContext;
 
+import static org.apache.camel.tooling.util.PackageHelper.findCamelDirectory;
+
 /**
  * Generate Endpoint DSL source files for Components.
  */
@@ -120,12 +122,27 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
     @Parameter(defaultValue = "true")
     protected boolean generateEndpointBuilders;
 
-    @Parameter(defaultValue = "${camel-generate-endpoint-dsl}")
+    @Parameter(defaultValue = "true")
     protected boolean generateEndpointDsl;
 
-    @Parameter(defaultValue = "${project.basedir}/src/generated/java")
+    /**
+     * The output directory
+     */
+    @Parameter
     protected File sourcesOutputDir;
 
+    /**
+     * Component Metadata file
+     */
+    @Parameter
+    protected File componentsMetadata;
+
+    /**
+     * Components DSL Metadata
+     */
+    @Parameter
+    protected File outputResourcesDir;
+
     DynamicClassLoader projectClassLoader;
 
     @Override
@@ -136,23 +153,28 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
         componentsFactoriesPackageName = "org.apache.camel.builder.endpoint.dsl";
         generateEndpointBuilderFactory = true;
         generateEndpointBuilders = true;
-        generateEndpointDsl = Boolean.parseBoolean(project.getProperties().getProperty("camel-generate-endpoint-dsl", "false"));
-        sourcesOutputDir = new File(project.getBasedir(), "src/generated/java");
         super.execute(project, projectHelper, buildContext);
     }
 
     @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
-        if (!generateEndpointDsl) {
-            return;
-        }
-
         try {
             projectClassLoader = DynamicClassLoader.createDynamicClassLoader(project.getTestClasspathElements());
         } catch (org.apache.maven.artifact.DependencyResolutionRequiredException e) {
             throw new RuntimeException(e.getMessage(), e);
         }
 
+        Path root = findCamelDirectory(baseDir, "core/camel-endpointdsl").toPath();
+        if (sourcesOutputDir == null) {
+            sourcesOutputDir = root.resolve("src/generated/java").toFile();
+        }
+        if (outputResourcesDir == null) {
+            outputResourcesDir = root.resolve("src/generated/resources").toFile();
+        }
+        if (componentsMetadata == null) {
+            componentsMetadata = outputResourcesDir.toPath().resolve("metadata.json").toFile();
+        }
+
         Map<File, Supplier<String>> files;
 
         try {
@@ -164,23 +186,6 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
 
         // generate component endpoint DSL files and write them
         executeComponent(files);
-
-        if (generateEndpointBuilderFactory || generateEndpointBuilders) {
-            getLog().info("Load components EndpointFactories");
-            List<File> endpointFactories = loadAllComponentsDslEndpointFactoriesAsFile();
-
-            if (generateEndpointBuilderFactory) {
-                getLog().info("Regenerate EndpointBuilderFactory");
-                // make sure EndpointBuilderFactory is synced
-                synchronizeEndpointBuilderFactoryInterface(endpointFactories);
-            }
-
-            if (generateEndpointBuilders) {
-                getLog().info("Regenerate EndpointBuilders");
-                // make sure EndpointBuilders is synced
-                synchronizeEndpointBuildersInterface(endpointFactories);
-            }
-        }
     }
 
     private static String loadJson(File file) {
@@ -223,20 +228,49 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
                     overrideComponentName = model.getArtifactId().replace("camel-", "");
                 }
 
-                createEndpointDsl(componentsFactoriesPackageName, model, compModels, overrideComponentName);
+                createEndpointDsl(model, compModels, overrideComponentName);
             }
         }
     }
 
+    private void createEndpointDsl(ComponentModel model, List<ComponentModel> aliases, String overrideComponentName) throws MojoFailureException {
+
+        doCreateEndpointDsl(model, aliases, overrideComponentName);
+
+        // Update components metadata
+        getLog().info("Load components EndpointFactories");
+        List<File> endpointFactories = loadAllComponentsDslEndpointFactoriesAsFile();
+
+        getLog().info("Regenerate EndpointBuilderFactory");
+        // make sure EndpointBuilderFactory is synced
+        synchronizeEndpointBuilderFactoryInterface(endpointFactories);
+
+        getLog().info("Regenerate EndpointBuilders");
+        // make sure EndpointBuilders is synced
+        synchronizeEndpointBuildersInterface(endpointFactories);
+    }
+
+    private ComponentsDslMetadataRegistry syncAndUpdateComponentsMetadataRegistry(final ComponentModel componentModel, final String className) {
+        final ComponentsDslMetadataRegistry componentsDslMetadataRegistry =
+                new ComponentsDslMetadataRegistry(sourcesOutputDir.toPath()
+                        .resolve(componentsFactoriesPackageName.replace('.', '/')).toFile(),
+                            componentsMetadata);
+        componentsDslMetadataRegistry.addComponentToMetadataAndSyncMetadataFile(componentModel, className);
+
+        getLog().info("Update components metadata with " + className);
+
+        return componentsDslMetadataRegistry;
+    }
+
     @SuppressWarnings("checkstyle:methodlength")
-    private void createEndpointDsl(String packageName, ComponentModel model, List<ComponentModel> aliases, String overrideComponentName) throws MojoFailureException {
+    private void doCreateEndpointDsl(ComponentModel model, List<ComponentModel> aliases, String overrideComponentName) throws MojoFailureException {
         String componentClassName = model.getJavaType();
         String builderName = getEndpointName(componentClassName);
         Class<?> realComponentClass = loadClass(componentClassName);
         Class<?> realEndpointClass = loadClass(findEndpointClassName(componentClassName));
 
         final JavaClass javaClass = new JavaClass(getProjectClassLoader());
-        javaClass.setPackage(packageName);
+        javaClass.setPackage(componentsFactoriesPackageName);
         javaClass.setName(builderName + "Factory");
         javaClass.setClass(false);
         javaClass.addImport("org.apache.camel.builder.EndpointConsumerBuilder");
@@ -333,7 +367,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
             advancedBuilderClass.addMethod().setName("basic").setReturnType(loadClass(builderClass.getCanonicalName())).setDefault().setBody("return (" + builderName + ") this;");
         }
 
-        generateDummyClass(packageName + ".T");
+        generateDummyClass(componentsFactoriesPackageName + ".T");
 
         String doc = GENERATED_MSG;
         if (!Strings.isEmpty(model.getDescription())) {
@@ -514,7 +548,7 @@ public class EndpointDslMojo extends AbstractGeneratorMojo {
             dslClass.addMethod(method.copy()).setDefault().setBodyF("return %s.%s(%s);", javaClass.getName(), method.getName(), String.join(",", method.getParametersNames()));
         }
 
-        writeSourceIfChanged(javaClass, packageName.replace('.', '/'), builderName + "Factory.java", false);
+        writeSourceIfChanged(javaClass, componentsFactoriesPackageName.replace('.', '/'), builderName + "Factory.java", false);
     }
 
     private void synchronizeEndpointBuilderFactoryInterface(List<File> factories) throws MojoFailureException {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
index e34b2f1..ff24376 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCamelMainMojo.java
@@ -27,16 +27,20 @@ import org.apache.camel.tooling.model.JsonMapper;
 import org.apache.camel.tooling.model.MainModel;
 import org.apache.camel.tooling.model.MainModel.MainGroupModel;
 import org.apache.camel.tooling.util.JavadocHelper;
+import org.apache.camel.tooling.util.PackageHelper;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
 import org.jboss.forge.roaster.Roaster;
 import org.jboss.forge.roaster.model.source.FieldSource;
 import org.jboss.forge.roaster.model.source.JavaClassSource;
 import org.jboss.forge.roaster.model.source.MethodSource;
+import org.sonatype.plexus.build.incremental.BuildContext;
 
 /**
  * Prepares camel-main by generating Camel Main configuration metadata for
@@ -48,19 +52,10 @@ public class PrepareCamelMainMojo extends AbstractGeneratorMojo {
     /**
      * The output directory for generated spring boot tooling file
      */
-    @Parameter(readonly = true, defaultValue = "${project.basedir}/src/generated/resources")
+    @Parameter(defaultValue = "${project.basedir}/src/generated/resources")
     protected File outFolder;
 
     /**
-     * The build directory
-     */
-    @Parameter(readonly = true, defaultValue = "${project.build.directory}/")
-    protected File buildDir;
-
-    @Parameter(defaultValue = "${camel-generate-main}")
-    protected boolean generateMain;
-
-    /**
      * Parses the Camel Main configuration java source file.
      */
     public static List<MainModel.MainOptionModel> parseConfigurationSource(String fileName) throws IOException {
@@ -147,16 +142,21 @@ public class PrepareCamelMainMojo extends AbstractGeneratorMojo {
     }
 
     @Override
+    public void execute(MavenProject project, MavenProjectHelper projectHelper, BuildContext buildContext) throws MojoFailureException, MojoExecutionException {
+        outFolder = new File(project.getBasedir(), "src/generated/resources");
+        super.execute(project, projectHelper, buildContext);
+    }
+
+    @Override
     public void execute() throws MojoExecutionException, MojoFailureException {
-        if (!generateMain) {
+        // scan for configuration files
+        File[] files = new File(project.getBasedir(), "src/main/java/org/apache/camel/main").listFiles(f -> f.isFile() && f.getName().endsWith("Properties.java"));
+        if (files == null || files.length == 0) {
             return;
         }
 
         final List<MainModel.MainOptionModel> data = new ArrayList<>();
 
-        // scan for configuration files
-        File[] files = new File(project.getBasedir(), "src/main/java/org/apache/camel/main").listFiles(f -> f.isFile() && f.getName().endsWith("Properties.java"));
-
         for (File file : files) {
             getLog().info("Parsing Camel Main configuration file: " + file);
             try {
@@ -181,7 +181,8 @@ public class PrepareCamelMainMojo extends AbstractGeneratorMojo {
         }
 
         // include additional rest configuration from camel-api
-        File restConfig = new File(buildDir, "../../camel-api/src/main/java/org/apache/camel/spi/RestConfiguration.java");
+        File camelApiDir = PackageHelper.findCamelDirectory(project.getBasedir(), "core/camel-api");
+        File restConfig = new File(camelApiDir, "src/main/java/org/apache/camel/spi/RestConfiguration.java");
         try {
             List<MainModel.MainOptionModel> model = parseConfigurationSource(restConfig);
             model.forEach(m -> m.setName("camel.rest." + m.getName()));
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
index a538e4b..9772155 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/TypeConverterLoaderGeneratorMojo.java
@@ -70,6 +70,9 @@ public class TypeConverterLoaderGeneratorMojo extends AbstractGeneratorMojo {
         if (resourcesOutputDir == null) {
             resourcesOutputDir = new File(project.getBasedir(), "src/generated/resources");
         }
+        if (!classesDirectory.isDirectory()) {
+            return;
+        }
         if ("pom".equals(project.getPackaging())) {
             return;
         }
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
index 8e1efd2..8527cce 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/dsl/component/ComponentsDslMetadataRegistry.java
@@ -52,7 +52,12 @@ public class ComponentsDslMetadataRegistry {
     }
 
     private Map<String, ComponentModel> loadMetadataFileIntoMap(final File metadataFile) {
-        String json = loadJson(metadataFile);
+        String json;
+        if (metadataFile.isFile()) {
+            json = loadJson(metadataFile);
+        } else {
+            json = "{ }";
+        }
         JsonObject jsonObject = JsonMapper.deserialize(json);
         Map<String, ComponentModel> models = new TreeMap<>();
         jsonObject.forEach((jsonKey, jsonValue) -> models.put(jsonKey, loadModel((JsonObject) jsonValue)));


[camel] 17/18: Sort the endpoints correctly in case there is an parent/child relationship

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

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

commit d1b3d437941edabd5fc99dbdc88157cd6a1203e2
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 3 07:19:57 2020 +0100

    Sort the endpoints correctly in case there is an parent/child relationship
---
 .../packaging/EndpointSchemaGeneratorMojo.java     | 42 +++++++++++++---------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 9745755..ce024dc 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -143,6 +143,7 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
                 return c1.getName().compareTo(c2.getName());
             }
         });
+        Map<Class, ComponentModel> models = new HashMap<>();
         for (Class<?> classElement : classes) {
             UriEndpoint uriEndpoint = classElement.getAnnotation(UriEndpoint.class);
             String scheme = uriEndpoint.scheme();
@@ -169,7 +170,26 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
                 }
                 final String aliasTitle = aTitle;
 
-                writeJSonSchemeAndPropertyConfigurer(classElement, uriEndpoint, aliasTitle, alias, extendsAlias, label, schemes);
+                ComponentModel parentData = null;
+                Class<?> superclass = classElement.getSuperclass();
+                if (superclass != null) {
+                    parentData = models.get(superclass);
+                    if (parentData == null) {
+                        UriEndpoint parentUriEndpoint = superclass.getAnnotation(UriEndpoint.class);
+                        if (parentUriEndpoint != null) {
+                            String parentScheme = parentUriEndpoint.scheme().split(",")[0];
+                            String superClassName = superclass.getName();
+                            String packageName = superClassName.substring(0, superClassName.lastIndexOf("."));
+                            String fileName = packageName.replace('.', '/') + "/" + parentScheme + ".json";
+                            String json = loadResource(fileName);
+                            parentData = JsonMapper.generateComponentModel(json);
+                        }
+                    }
+                }
+
+                ComponentModel model = writeJSonSchemeAndPropertyConfigurer(classElement, uriEndpoint, aliasTitle, alias,
+                        extendsAlias, label, schemes, parentData);
+                models.put(classElement, model);
             }
         }
     }
@@ -182,26 +202,14 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
         }
     }
 
-    protected void writeJSonSchemeAndPropertyConfigurer(Class<?> classElement, UriEndpoint uriEndpoint, String title,
-                                                        String scheme, String extendsScheme, String label, String[] schemes) {
+    protected ComponentModel writeJSonSchemeAndPropertyConfigurer(Class<?> classElement, UriEndpoint uriEndpoint, String title,
+                                                        String scheme, String extendsScheme, String label,
+                                                        String[] schemes, ComponentModel parentData) {
         // gather component information
         ComponentModel componentModel = findComponentProperties(uriEndpoint, classElement, title, scheme, extendsScheme, label, schemes);
 
         // get endpoint information which is divided into paths and options
         // (though there should really only be one path)
-        ComponentModel parentData = null;
-        Class<?> superclass = classElement.getSuperclass();
-        if (superclass != null) {
-            UriEndpoint parentUriEndpoint = superclass.getAnnotation(UriEndpoint.class);
-            if (parentUriEndpoint != null) {
-                String parentScheme = parentUriEndpoint.scheme().split(",")[0];
-                String superClassName = superclass.getName();
-                String packageName = superClassName.substring(0, superClassName.lastIndexOf("."));
-                String fileName = packageName.replace('.', '/') + "/" + parentScheme + ".json";
-                String json = loadResource(fileName);
-                parentData = JsonMapper.generateComponentModel(json);
-            }
-        }
 
         // component options
         Class<?> componentClassElement = loadClass(componentModel.getJavaType());
@@ -231,6 +239,8 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
         updateResource(resourcesOutputDir.toPath(), file, json);
 
         generateEndpointConfigurer(classElement, uriEndpoint, scheme, schemes, componentModel, parentData);
+
+        return componentModel;
     }
 
     protected void updateResource(Path dir, String file, String data) {


[camel] 14/18: Regen (properties ordering)

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

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

commit 6d22349ad273350d7d47dfeecf83bdfd12d421eb
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 21:49:50 2020 +0100

    Regen (properties ordering)
---
 .../apache/camel/component/activemq/activemq.json  |   2 +-
 .../src/main/docs/activemq-component.adoc          |   2 +-
 .../org/apache/camel/component/amqp/amqp.json      |   2 +-
 .../camel-amqp/src/main/docs/amqp-component.adoc   |   2 +-
 .../org/apache/camel/component/aws/s3/aws-s3.json  |   6 +-
 .../src/main/docs/aws-s3-component.adoc            |   6 +-
 .../apache/camel/component/aws/sqs/aws-sqs.json    |  14 +-
 .../src/main/docs/aws-sqs-component.adoc           |  14 +-
 .../apache/camel/component/aws/swf/aws-swf.json    |  30 +-
 .../src/main/docs/aws-swf-component.adoc           |  26 +-
 .../apache/camel/component/aws2/sqs/aws2-sqs.json  |  14 +-
 .../src/main/docs/aws2-sqs-component.adoc          |  14 +-
 .../org/apache/camel/component/box/box.json        |  10 +-
 .../src/main/docs/box-component.adoc               |  10 +-
 .../camel/component/braintree/braintree.json       |  10 +-
 .../src/main/docs/braintree-component.adoc         |  10 +-
 .../org/apache/camel/component/consul/consul.json  |  16 +-
 .../src/main/docs/consul-component.adoc            |  12 +-
 .../apache/camel/component/elytron/elytron.json    |   4 +-
 .../src/main/docs/elytron-component.adoc           |   2 +-
 .../org/apache/camel/component/fhir/fhir.json      |   8 +-
 .../src/main/docs/fhir-component.adoc              |   8 +-
 .../apache/camel/component/file/remote/ftp.json    |   8 +-
 .../apache/camel/component/file/remote/ftps.json   |   8 +-
 .../apache/camel/component/file/remote/sftp.json   |   8 +-
 .../camel-ftp/src/main/docs/ftp-component.adoc     |   6 +-
 .../camel-ftp/src/main/docs/ftps-component.adoc    |   6 +-
 .../camel-ftp/src/main/docs/sftp-component.adoc    |   6 +-
 .../component/google/pubsub/google-pubsub.json     |   2 +-
 .../org/apache/camel/component/jms/jms.json        |   2 +-
 .../camel-jms/src/main/docs/jms-component.adoc     |   2 +-
 .../org/apache/camel/component/jmx/jmx.json        |   8 +-
 .../camel-jmx/src/main/docs/jmx-component.adoc     |   6 +-
 .../org/apache/camel/component/mail/imap.json      |   4 +-
 .../org/apache/camel/component/mail/imaps.json     |   4 +-
 .../org/apache/camel/component/mail/pop3.json      |   4 +-
 .../org/apache/camel/component/mail/pop3s.json     |   4 +-
 .../org/apache/camel/component/mail/smtp.json      |   4 +-
 .../org/apache/camel/component/mail/smtps.json     |   4 +-
 .../camel-mail/src/main/docs/mail-component.adoc   |   2 +-
 .../org/apache/camel/component/mllp/mllp.json      |  12 +-
 .../camel-mllp/src/main/docs/mllp-component.adoc   |  10 +-
 .../apache/camel/component/telegram/telegram.json  |   4 +-
 .../src/main/docs/telegram-component.adoc          |   4 +-
 .../directmessage/twitter-directmessage.json       |  12 +-
 .../component/twitter/search/twitter-search.json   |  12 +-
 .../twitter/timeline/twitter-timeline.json         |  12 +-
 .../main/docs/twitter-directmessage-component.adoc |  10 +-
 .../src/main/docs/twitter-search-component.adoc    |  10 +-
 .../src/main/docs/twitter-timeline-component.adoc  |  10 +-
 .../apache/camel/component/undertow/undertow.json  |   4 +-
 .../src/main/docs/undertow-component.adoc          |   2 +-
 .../apache/camel/component/weather/weather.json    |  28 +-
 .../src/main/docs/weather-component.adoc           |  28 +-
 .../component/xmlsecurity/xmlsecurity-verify.json  |   2 +-
 .../main/docs/xmlsecurity-verify-component.adoc    |   2 +-
 .../component/ComponentsBuilderFactory.java        |   3 +-
 .../dsl/ActivemqComponentBuilderFactory.java       |  30 +-
 .../component/dsl/AmqpComponentBuilderFactory.java |  30 +-
 .../dsl/AwsS3ComponentBuilderFactory.java          |  30 +-
 .../dsl/AwsSwfComponentBuilderFactory.java         | 158 +++----
 .../component/dsl/BoxComponentBuilderFactory.java  |  32 +-
 .../dsl/ConsulComponentBuilderFactory.java         |  82 ++--
 .../dsl/GooglePubsubComponentBuilderFactory.java   |   6 +-
 .../component/dsl/JmsComponentBuilderFactory.java  |  30 +-
 .../XmlsecurityVerifyComponentBuilderFactory.java  |  44 +-
 .../src/generated/resources/metadata.json          |   2 +-
 .../endpoint/dsl/BoxEndpointBuilderFactory.java    | 178 ++++----
 .../dsl/BraintreeEndpointBuilderFactory.java       | 204 ++++-----
 .../endpoint/dsl/ConsulEndpointBuilderFactory.java | 122 ++---
 .../dsl/ElytronEndpointBuilderFactory.java         | 104 ++---
 .../endpoint/dsl/FhirEndpointBuilderFactory.java   | 112 ++---
 .../endpoint/dsl/FtpEndpointBuilderFactory.java    |  66 +--
 .../endpoint/dsl/FtpsEndpointBuilderFactory.java   | 156 +++----
 .../dsl/GooglePubsubEndpointBuilderFactory.java    |   9 +-
 .../endpoint/dsl/JMXEndpointBuilderFactory.java    | 146 +++---
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |  54 +--
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   | 216 ++++-----
 .../endpoint/dsl/S3EndpointBuilderFactory.java     | 328 +++++++-------
 .../endpoint/dsl/SWFEndpointBuilderFactory.java    |  88 ++--
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   | 156 +++----
 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java   | 280 ++++++------
 .../endpoint/dsl/SqsEndpointBuilderFactory.java    | 280 ++++++------
 .../dsl/TelegramEndpointBuilderFactory.java        |  68 +--
 ...TwitterDirectMessageEndpointBuilderFactory.java | 184 ++++----
 .../dsl/TwitterSearchEndpointBuilderFactory.java   | 180 ++++----
 .../dsl/TwitterTimelineEndpointBuilderFactory.java | 180 ++++----
 .../dsl/UndertowEndpointBuilderFactory.java        | 104 ++---
 .../dsl/WeatherEndpointBuilderFactory.java         | 490 ++++++++++-----------
 .../modules/ROOT/pages/activemq-component.adoc     |   2 +-
 .../modules/ROOT/pages/amqp-component.adoc         |   2 +-
 .../modules/ROOT/pages/aws-s3-component.adoc       |   6 +-
 .../modules/ROOT/pages/aws-sqs-component.adoc      |  14 +-
 .../modules/ROOT/pages/aws-swf-component.adoc      |  26 +-
 .../modules/ROOT/pages/aws2-sqs-component.adoc     |  14 +-
 .../modules/ROOT/pages/box-component.adoc          |  10 +-
 .../modules/ROOT/pages/braintree-component.adoc    |  10 +-
 .../modules/ROOT/pages/consul-component.adoc       |  12 +-
 .../modules/ROOT/pages/elytron-component.adoc      |   2 +-
 .../modules/ROOT/pages/fhir-component.adoc         |   8 +-
 .../modules/ROOT/pages/ftp-component.adoc          |   6 +-
 .../modules/ROOT/pages/ftps-component.adoc         |   6 +-
 docs/components/modules/ROOT/pages/index.adoc      |   2 +-
 .../modules/ROOT/pages/jms-component.adoc          |   2 +-
 .../modules/ROOT/pages/jmx-component.adoc          |   6 +-
 .../modules/ROOT/pages/mail-component.adoc         |   2 +-
 .../modules/ROOT/pages/mllp-component.adoc         |  10 +-
 .../modules/ROOT/pages/sftp-component.adoc         |   6 +-
 .../modules/ROOT/pages/telegram-component.adoc     |   4 +-
 .../pages/twitter-directmessage-component.adoc     |  10 +-
 .../ROOT/pages/twitter-search-component.adoc       |  10 +-
 .../ROOT/pages/twitter-timeline-component.adoc     |  10 +-
 .../modules/ROOT/pages/undertow-component.adoc     |   2 +-
 .../modules/ROOT/pages/weather-component.adoc      |  28 +-
 .../ROOT/pages/xmlsecurity-verify-component.adoc   |   2 +-
 115 files changed, 2421 insertions(+), 2415 deletions(-)

diff --git a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
index 0c86a1e..02ad816 100644
--- a/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
+++ b/components/camel-activemq/src/generated/resources/org/apache/camel/component/activemq/activemq.json
@@ -108,9 +108,9 @@
     "useMessageIDAsCorrelationID": { "kind": "property", "displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages." },
     "waitForProvisionCorrelationToBeUpdatedCounter": { "kind": "property", "displayName": "Wait For Provision Correlation To Be Updated Counter", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "50", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Number of times to wait for provisional correlation id to b [...]
     "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": { "kind": "property", "displayName": "Wait For Provision Correlation To Be Updated Thread Sleeping Time", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "100", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Interval in millis to sleep each  [...]
+    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "errorHandlerLoggingLevel": { "kind": "property", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "secret": false, "defaultValue": "WARN", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows to [...]
     "errorHandlerLogStackTrace": { "kind": "property", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
-    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
     "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
     "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether to use transacted mode" },
diff --git a/components/camel-activemq/src/main/docs/activemq-component.adoc b/components/camel-activemq/src/main/docs/activemq-component.adoc
index f8a8c81..c6951d1 100644
--- a/components/camel-activemq/src/main/docs/activemq-component.adoc
+++ b/components/camel-activemq/src/main/docs/activemq-component.adoc
@@ -144,9 +144,9 @@ The ActiveMQ component supports 99 options, which are listed below.
 | *useMessageIDAsCorrelationID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
 | *waitForProvisionCorrelationTo BeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
 | *waitForProvisionCorrelationTo BeUpdatedThreadSleepingTime* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
+| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
-| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
diff --git a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
index c0d8f33..c3ce379 100644
--- a/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
+++ b/components/camel-amqp/src/generated/resources/org/apache/camel/component/amqp/amqp.json
@@ -105,9 +105,9 @@
     "useMessageIDAsCorrelationID": { "kind": "property", "displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages." },
     "waitForProvisionCorrelationToBeUpdatedCounter": { "kind": "property", "displayName": "Wait For Provision Correlation To Be Updated Counter", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "50", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Number of times to wait for provisional correlation id to b [...]
     "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": { "kind": "property", "displayName": "Wait For Provision Correlation To Be Updated Thread Sleeping Time", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "100", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Interval in millis to sleep each  [...]
+    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "errorHandlerLoggingLevel": { "kind": "property", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "secret": false, "defaultValue": "WARN", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows to [...]
     "errorHandlerLogStackTrace": { "kind": "property", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
-    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
     "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
     "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether to use transacted mode" },
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 017a3d5..6545d36 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -133,9 +133,9 @@ The AMQP component supports 96 options, which are listed below.
 | *useMessageIDAsCorrelationID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
 | *waitForProvisionCorrelationTo BeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
 | *waitForProvisionCorrelationTo BeUpdatedThreadSleepingTime* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
+| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
-| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
diff --git a/components/camel-aws-s3/src/generated/resources/org/apache/camel/component/aws/s3/aws-s3.json b/components/camel-aws-s3/src/generated/resources/org/apache/camel/component/aws/s3/aws-s3.json
index c4932c4..90faab6 100644
--- a/components/camel-aws-s3/src/generated/resources/org/apache/camel/component/aws/s3/aws-s3.json
+++ b/components/camel-aws-s3/src/generated/resources/org/apache/camel/component/aws/s3/aws-s3.json
@@ -48,12 +48,12 @@
     "storageClass": { "kind": "property", "displayName": "Storage Class", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request." },
     "awsKMSKeyId": { "kind": "property", "displayName": "Aws KMSKey Id", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define the id of KMS key to use in case KMS is enabled" },
     "useAwsKMS": { "kind": "property", "displayName": "Use Aws KMS", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if KMS must be used or not" },
-    "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "accelerateModeEnabled": { "kind": "property", "displayName": "Accelerate Mode Enabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if Accelerate Mode enabled is true or false" },
     "chunkedEncodingDisabled": { "kind": "property", "displayName": "Chunked Encoding Disabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if disabled Chunked Encoding is true or false" },
     "dualstackEnabled": { "kind": "property", "displayName": "Dualstack Enabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if Dualstack enabled is true or false" },
     "forceGlobalBucketAccessEnabled": { "kind": "property", "displayName": "Force Global Bucket Access Enabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if Force Global Bucket Access enabled is true or false" },
     "payloadSigningEnabled": { "kind": "property", "displayName": "Payload Signing Enabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if Payload Signing enabled is true or false" },
+    "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "accessKey": { "kind": "property", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
   },
@@ -93,13 +93,13 @@
     "storageClass": { "kind": "parameter", "displayName": "Storage Class", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request." },
     "awsKMSKeyId": { "kind": "parameter", "displayName": "Aws KMSKey Id", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define the id of KMS key to use in case KMS is enabled" },
     "useAwsKMS": { "kind": "parameter", "displayName": "Use Aws KMS", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if KMS must be used or not" },
-    "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "accelerateModeEnabled": { "kind": "parameter", "displayName": "Accelerate Mode Enabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if Accelerate Mode enabled is true or false" },
     "chunkedEncodingDisabled": { "kind": "parameter", "displayName": "Chunked Encoding Disabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if disabled Chunked Encoding is true or false" },
     "dualstackEnabled": { "kind": "parameter", "displayName": "Dualstack Enabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if Dualstack enabled is true or false" },
     "forceGlobalBucketAccessEnabled": { "kind": "parameter", "displayName": "Force Global Bucket Access Enabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if Force Global Bucket Access enabled is true or false" },
     "payloadSigningEnabled": { "kind": "parameter", "displayName": "Payload Signing Enabled", "group": " advanced", "label": "common, advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws.s3.S3Configuration", "configurationField": "configuration", "description": "Define if Payload Signing enabled is true or false" },
+    "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
index d8118f1..6ce409d 100644
--- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
@@ -76,12 +76,12 @@ The AWS S3 Storage Service component supports 37 options, which are listed below
 | *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. |  | String
 | *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled |  | String
 | *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
-| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *accelerateModeEnabled* ( advanced) | Define if Accelerate Mode enabled is true or false | false | boolean
 | *chunkedEncodingDisabled* ( advanced) | Define if disabled Chunked Encoding is true or false | false | boolean
 | *dualstackEnabled* ( advanced) | Define if Dualstack enabled is true or false | false | boolean
 | *forceGlobalBucketAccessEnabled* ( advanced) | Define if Force Global Bucket Access enabled is true or false | false | boolean
 | *payloadSigningEnabled* ( advanced) | Define if Payload Signing enabled is true or false | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
 |===
@@ -156,13 +156,13 @@ with the following path and query parameters:
 | *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. |  | String
 | *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled |  | String
 | *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
-| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accelerateModeEnabled* ( advanced) | Define if Accelerate Mode enabled is true or false | false | boolean
 | *chunkedEncodingDisabled* ( advanced) | Define if disabled Chunked Encoding is true or false | false | boolean
 | *dualstackEnabled* ( advanced) | Define if Dualstack enabled is true or false | false | boolean
 | *forceGlobalBucketAccessEnabled* ( advanced) | Define if Force Global Bucket Access enabled is true or false | false | boolean
 | *payloadSigningEnabled* ( advanced) | Define if Payload Signing enabled is true or false | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
diff --git a/components/camel-aws-sqs/src/generated/resources/org/apache/camel/component/aws/sqs/aws-sqs.json b/components/camel-aws-sqs/src/generated/resources/org/apache/camel/component/aws/sqs/aws-sqs.json
index 2350062..9d54812 100644
--- a/components/camel-aws-sqs/src/generated/resources/org/apache/camel/component/aws/sqs/aws-sqs.json
+++ b/components/camel-aws-sqs/src/generated/resources/org/apache/camel/component/aws/sqs/aws-sqs.json
@@ -95,6 +95,13 @@
     "delayQueue": { "kind": "parameter", "displayName": "Delay Queue", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "Define if you want to apply delaySeconds option to the queue or on single messages" },
     "queueUrl": { "kind": "parameter", "displayName": "Queue Url", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the SQS client" },
+    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the SQS client" },
+    "maximumMessageSize": { "kind": "parameter", "displayName": "Maximum Message Size", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The maximumMessageSize (in bytes) an SQS message can contain for this queue." },
+    "messageRetentionPeriod": { "kind": "parameter", "displayName": "Message Retention Period", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue." },
+    "policy": { "kind": "parameter", "displayName": "Policy", "group": "queue", "label": "queue", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The policy for this queue" },
+    "receiveMessageWaitTimeSeconds": { "kind": "parameter", "displayName": "Receive Message Wait Time Seconds", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds [...]
+    "redrivePolicy": { "kind": "parameter", "displayName": "Redrive Policy", "group": "queue", "label": "queue", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "Specify the policy that send message to DeadLetter queue. See detail at Amazon docs." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
@@ -109,13 +116,6 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the SQS client" },
-    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the SQS client" },
-    "maximumMessageSize": { "kind": "parameter", "displayName": "Maximum Message Size", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The maximumMessageSize (in bytes) an SQS message can contain for this queue." },
-    "messageRetentionPeriod": { "kind": "parameter", "displayName": "Message Retention Period", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue." },
-    "policy": { "kind": "parameter", "displayName": "Policy", "group": "queue", "label": "queue", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "The policy for this queue" },
-    "receiveMessageWaitTimeSeconds": { "kind": "parameter", "displayName": "Receive Message Wait Time Seconds", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds [...]
-    "redrivePolicy": { "kind": "parameter", "displayName": "Redrive Policy", "group": "queue", "label": "queue", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "Specify the policy that send message to DeadLetter queue. See detail at Amazon docs." },
     "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
     "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.sqs.SqsConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
   }
diff --git a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
index 7e047a6..1c63e2a 100644
--- a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
@@ -146,6 +146,13 @@ with the following path and query parameters:
 | *delayQueue* (advanced) | Define if you want to apply delaySeconds option to the queue or on single messages | false | boolean
 | *queueUrl* (advanced) | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. |  | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *proxyHost* (proxy) | To define a proxy host when instantiating the SQS client |  | String
+| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client |  | Integer
+| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. |  | Integer
+| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. |  | Integer
+| *policy* (queue) | The policy for this queue |  | String
+| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. |  | Integer
+| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -160,13 +167,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *proxyHost* (proxy) | To define a proxy host when instantiating the SQS client |  | String
-| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client |  | Integer
-| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. |  | Integer
-| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. |  | Integer
-| *policy* (queue) | The policy for this queue |  | String
-| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. |  | Integer
-| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. |  | String
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
 |===
diff --git a/components/camel-aws-swf/src/generated/resources/org/apache/camel/component/aws/swf/aws-swf.json b/components/camel-aws-swf/src/generated/resources/org/apache/camel/component/aws/swf/aws-swf.json
index 206f3e4..27745ee 100644
--- a/components/camel-aws-swf/src/generated/resources/org/apache/camel/component/aws/swf/aws-swf.json
+++ b/components/camel-aws-swf/src/generated/resources/org/apache/camel/component/aws/swf/aws-swf.json
@@ -28,15 +28,17 @@
     "version": { "kind": "property", "displayName": "Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "The workflow or activity event version to use." },
     "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
-    "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
-    "clientConfigurationParameters": { "kind": "property", "displayName": "Client Configuration Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "clientConfiguration.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configure th [...]
-    "startWorkflowOptionsParameters": { "kind": "property", "displayName": "Start Workflow Options Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "startWorkflowOptions.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configur [...]
-    "sWClientParameters": { "kind": "property", "displayName": "SWClient Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "sWClient.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configure the AmazonSimpleWorkflowClient using [...]
     "activityList": { "kind": "property", "displayName": "Activity List", "group": "activity", "label": "consumer,activity", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "The list name to consume activities from." },
     "activitySchedulingOptions": { "kind": "property", "displayName": "Activity Scheduling Options", "group": "activity", "label": "producer,activity", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Activity scheduling options" },
     "activityThreadPoolSize": { "kind": "property", "displayName": "Activity Thread Pool Size", "group": "activity", "label": "consumer,activity", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "100", "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Maximum number of threads in work pool for activity." },
     "activityTypeExecutionOptions": { "kind": "property", "displayName": "Activity Type Execution Options", "group": "activity", "label": "consumer,activity", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Activity execution options" },
     "activityTypeRegistrationOptions": { "kind": "property", "displayName": "Activity Type Registration Options", "group": "activity", "label": "consumer,activity", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Activity registration o [...]
+    "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
+    "clientConfigurationParameters": { "kind": "property", "displayName": "Client Configuration Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "clientConfiguration.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configure th [...]
+    "startWorkflowOptionsParameters": { "kind": "property", "displayName": "Start Workflow Options Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "startWorkflowOptions.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configur [...]
+    "sWClientParameters": { "kind": "property", "displayName": "SWClient Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "sWClient.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configure the AmazonSimpleWorkflowClient using [...]
+    "accessKey": { "kind": "property", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key." },
+    "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key." },
     "childPolicy": { "kind": "property", "displayName": "Child Policy", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "The policy to use on child workflows when terminating a workflow." },
     "executionStartToCloseTimeout": { "kind": "property", "displayName": "Execution Start To Close Timeout", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "3600", "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Set the execution start to close timeout." },
     "operation": { "kind": "property", "displayName": "Operation", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SIGNAL", "CANCEL", "TERMINATE", "GET_STATE", "START", "DESCRIBE", "GET_HISTORY" ], "deprecated": false, "secret": false, "defaultValue": "START", "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Workflow operation" },
@@ -46,9 +48,7 @@
     "terminationDetails": { "kind": "property", "displayName": "Termination Details", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Details for terminating a workflow." },
     "terminationReason": { "kind": "property", "displayName": "Termination Reason", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "The reason for terminating a workflow." },
     "workflowList": { "kind": "property", "displayName": "Workflow List", "group": "workflow", "label": "consumer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "The list name to consume workflows from." },
-    "workflowTypeRegistrationOptions": { "kind": "property", "displayName": "Workflow Type Registration Options", "group": "workflow", "label": "consumer,workflow", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Workflow registration options" },
-    "accessKey": { "kind": "property", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key." },
-    "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key." }
+    "workflowTypeRegistrationOptions": { "kind": "property", "displayName": "Workflow Type Registration Options", "group": "workflow", "label": "consumer,workflow", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Workflow registration options" }
   },
   "properties": {
     "type": { "kind": "path", "displayName": "Type", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "activity", "workflow" ], "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Activity or workflow" },
@@ -62,16 +62,18 @@
     "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with [...]
     "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
-    "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
-    "clientConfigurationParameters": { "kind": "parameter", "displayName": "Client Configuration Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "clientConfiguration.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configure t [...]
-    "startWorkflowOptionsParameters": { "kind": "parameter", "displayName": "Start Workflow Options Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "startWorkflowOptions.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configu [...]
-    "sWClientParameters": { "kind": "parameter", "displayName": "SWClient Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "sWClient.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configure the AmazonSimpleWorkflowClient usin [...]
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "activityList": { "kind": "parameter", "displayName": "Activity List", "group": "activity", "label": "consumer,activity", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "The list name to consume activities from." },
     "activitySchedulingOptions": { "kind": "parameter", "displayName": "Activity Scheduling Options", "group": "activity", "label": "producer,activity", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Activity scheduling options" },
     "activityThreadPoolSize": { "kind": "parameter", "displayName": "Activity Thread Pool Size", "group": "activity", "label": "consumer,activity", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "100", "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Maximum number of threads in work pool for activity." },
     "activityTypeExecutionOptions": { "kind": "parameter", "displayName": "Activity Type Execution Options", "group": "activity", "label": "consumer,activity", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Activity execution options" },
     "activityTypeRegistrationOptions": { "kind": "parameter", "displayName": "Activity Type Registration Options", "group": "activity", "label": "consumer,activity", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Activity registration  [...]
+    "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
+    "clientConfigurationParameters": { "kind": "parameter", "displayName": "Client Configuration Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "clientConfiguration.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configure t [...]
+    "startWorkflowOptionsParameters": { "kind": "parameter", "displayName": "Start Workflow Options Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "startWorkflowOptions.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configu [...]
+    "sWClientParameters": { "kind": "parameter", "displayName": "SWClient Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "sWClient.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "To configure the AmazonSimpleWorkflowClient usin [...]
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key." },
+    "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key." },
     "childPolicy": { "kind": "parameter", "displayName": "Child Policy", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "The policy to use on child workflows when terminating a workflow." },
     "executionStartToCloseTimeout": { "kind": "parameter", "displayName": "Execution Start To Close Timeout", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "3600", "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Set the execution start to close timeout." },
     "operation": { "kind": "parameter", "displayName": "Operation", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "SIGNAL", "CANCEL", "TERMINATE", "GET_STATE", "START", "DESCRIBE", "GET_HISTORY" ], "deprecated": false, "secret": false, "defaultValue": "START", "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Workflow operation" },
@@ -81,8 +83,6 @@
     "terminationDetails": { "kind": "parameter", "displayName": "Termination Details", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Details for terminating a workflow." },
     "terminationReason": { "kind": "parameter", "displayName": "Termination Reason", "group": "workflow", "label": "producer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "The reason for terminating a workflow." },
     "workflowList": { "kind": "parameter", "displayName": "Workflow List", "group": "workflow", "label": "consumer,workflow", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "The list name to consume workflows from." },
-    "workflowTypeRegistrationOptions": { "kind": "parameter", "displayName": "Workflow Type Registration Options", "group": "workflow", "label": "consumer,workflow", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Workflow registration options" },
-    "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Amazon AWS Access Key." },
-    "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key." }
+    "workflowTypeRegistrationOptions": { "kind": "parameter", "displayName": "Workflow Type Registration Options", "group": "workflow", "label": "consumer,workflow", "required": false, "type": "object", "javaType": "com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.swf.SWFConfiguration", "configurationField": "configuration", "description": "Workflow registration options" }
   }
 }
diff --git a/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc b/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
index 2092955..1c63a8e 100644
--- a/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
+++ b/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
@@ -46,15 +46,17 @@ The AWS Simple Workflow component supports 30 options, which are listed below.
 | *version* (common) | The workflow or activity event version to use. |  | String
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *clientConfigurationParameters* (advanced) | To configure the ClientConfiguration using the key/values from the Map. |  | Map
-| *startWorkflowOptionsParameters* (advanced) | To configure the StartWorkflowOptions using the key/values from the Map. |  | Map
-| *sWClientParameters* (advanced) | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. |  | Map
 | *activityList* (activity) | The list name to consume activities from. |  | String
 | *activitySchedulingOptions* (activity) | Activity scheduling options |  | ActivitySchedulingOptions
 | *activityThreadPoolSize* (activity) | Maximum number of threads in work pool for activity. | 100 | int
 | *activityTypeExecutionOptions* (activity) | Activity execution options |  | ActivityTypeExecutionOptions
 | *activityTypeRegistration Options* (activity) | Activity registration options |  | ActivityTypeRegistrationOptions
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+| *clientConfigurationParameters* (advanced) | To configure the ClientConfiguration using the key/values from the Map. |  | Map
+| *startWorkflowOptionsParameters* (advanced) | To configure the StartWorkflowOptions using the key/values from the Map. |  | Map
+| *sWClientParameters* (advanced) | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. |  | Map
+| *accessKey* (security) | Amazon AWS Access Key. |  | String
+| *secretKey* (security) | Amazon AWS Secret Key. |  | String
 | *childPolicy* (workflow) | The policy to use on child workflows when terminating a workflow. |  | String
 | *executionStartToCloseTimeout* (workflow) | Set the execution start to close timeout. | 3600 | String
 | *operation* (workflow) | Workflow operation. The value can be one of: SIGNAL, CANCEL, TERMINATE, GET_STATE, START, DESCRIBE, GET_HISTORY | START | String
@@ -65,8 +67,6 @@ The AWS Simple Workflow component supports 30 options, which are listed below.
 | *terminationReason* (workflow) | The reason for terminating a workflow. |  | String
 | *workflowList* (workflow) | The list name to consume workflows from. |  | String
 | *workflowTypeRegistration Options* (workflow) | Workflow registration options |  | WorkflowTypeRegistrationOptions
-| *accessKey* (security) | Amazon AWS Access Key. |  | String
-| *secretKey* (security) | Amazon AWS Secret Key. |  | String
 |===
 // component options: END
 
@@ -108,16 +108,18 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. The value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *clientConfigurationParameters* (advanced) | To configure the ClientConfiguration using the key/values from the Map. |  | Map
-| *startWorkflowOptionsParameters* (advanced) | To configure the StartWorkflowOptions using the key/values from the Map. |  | Map
-| *sWClientParameters* (advanced) | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. |  | Map
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *activityList* (activity) | The list name to consume activities from. |  | String
 | *activitySchedulingOptions* (activity) | Activity scheduling options |  | ActivitySchedulingOptions
 | *activityThreadPoolSize* (activity) | Maximum number of threads in work pool for activity. | 100 | int
 | *activityTypeExecutionOptions* (activity) | Activity execution options |  | ActivityTypeExecutionOptions
 | *activityTypeRegistration Options* (activity) | Activity registration options |  | ActivityTypeRegistrationOptions
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+| *clientConfigurationParameters* (advanced) | To configure the ClientConfiguration using the key/values from the Map. |  | Map
+| *startWorkflowOptionsParameters* (advanced) | To configure the StartWorkflowOptions using the key/values from the Map. |  | Map
+| *sWClientParameters* (advanced) | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. |  | Map
+| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *accessKey* (security) | Amazon AWS Access Key. |  | String
+| *secretKey* (security) | Amazon AWS Secret Key. |  | String
 | *childPolicy* (workflow) | The policy to use on child workflows when terminating a workflow. |  | String
 | *executionStartToCloseTimeout* (workflow) | Set the execution start to close timeout. | 3600 | String
 | *operation* (workflow) | Workflow operation. The value can be one of: SIGNAL, CANCEL, TERMINATE, GET_STATE, START, DESCRIBE, GET_HISTORY | START | String
@@ -128,8 +130,6 @@ with the following path and query parameters:
 | *terminationReason* (workflow) | The reason for terminating a workflow. |  | String
 | *workflowList* (workflow) | The list name to consume workflows from. |  | String
 | *workflowTypeRegistration Options* (workflow) | Workflow registration options |  | WorkflowTypeRegistrationOptions
-| *accessKey* (security) | Amazon AWS Access Key. |  | String
-| *secretKey* (security) | Amazon AWS Secret Key. |  | String
 |===
 // endpoint options: END
 
diff --git a/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json b/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
index e0a8be6..8ba4d31 100644
--- a/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
+++ b/components/camel-aws2-sqs/src/generated/resources/org/apache/camel/component/aws2/sqs/aws2-sqs.json
@@ -95,6 +95,13 @@
     "delayQueue": { "kind": "parameter", "displayName": "Delay Queue", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Define if you want to apply delaySeconds option to the queue or on single messages" },
     "queueUrl": { "kind": "parameter", "displayName": "Queue Url", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be use [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the SQS client" },
+    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the SQS client" },
+    "maximumMessageSize": { "kind": "parameter", "displayName": "Maximum Message Size", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The maximumMessageSize (in bytes) an SQS message can contain for this queue." },
+    "messageRetentionPeriod": { "kind": "parameter", "displayName": "Message Retention Period", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue." },
+    "policy": { "kind": "parameter", "displayName": "Policy", "group": "queue", "label": "queue", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The policy for this queue" },
+    "receiveMessageWaitTimeSeconds": { "kind": "parameter", "displayName": "Receive Message Wait Time Seconds", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSecon [...]
+    "redrivePolicy": { "kind": "parameter", "displayName": "Redrive Policy", "group": "queue", "label": "queue", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the policy that send message to DeadLetter queue. See detail at Amazon docs." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
@@ -109,13 +116,6 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the SQS client" },
-    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the SQS client" },
-    "maximumMessageSize": { "kind": "parameter", "displayName": "Maximum Message Size", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The maximumMessageSize (in bytes) an SQS message can contain for this queue." },
-    "messageRetentionPeriod": { "kind": "parameter", "displayName": "Message Retention Period", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue." },
-    "policy": { "kind": "parameter", "displayName": "Policy", "group": "queue", "label": "queue", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "The policy for this queue" },
-    "receiveMessageWaitTimeSeconds": { "kind": "parameter", "displayName": "Receive Message Wait Time Seconds", "group": "queue", "label": "queue", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSecon [...]
-    "redrivePolicy": { "kind": "parameter", "displayName": "Redrive Policy", "group": "queue", "label": "queue", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Specify the policy that send message to DeadLetter queue. See detail at Amazon docs." },
     "accessKey": { "kind": "parameter", "displayName": "Access Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Amazon AWS Access Key" },
     "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
   }
diff --git a/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc b/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
index 32b8c70..4022f47 100644
--- a/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
+++ b/components/camel-aws2-sqs/src/main/docs/aws2-sqs-component.adoc
@@ -151,6 +151,13 @@ with the following path and query parameters:
 | *delayQueue* (advanced) | Define if you want to apply delaySeconds option to the queue or on single messages | false | boolean
 | *queueUrl* (advanced) | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. |  | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *proxyHost* (proxy) | To define a proxy host when instantiating the SQS client |  | String
+| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client |  | Integer
+| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. |  | Integer
+| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. |  | Integer
+| *policy* (queue) | The policy for this queue |  | String
+| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. |  | Integer
+| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -165,13 +172,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *proxyHost* (proxy) | To define a proxy host when instantiating the SQS client |  | String
-| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client |  | Integer
-| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. |  | Integer
-| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. |  | Integer
-| *policy* (queue) | The policy for this queue |  | String
-| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. |  | Integer
-| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. |  | String
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
 |===
diff --git a/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json b/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
index 25443cb..992acdf 100644
--- a/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
+++ b/components/camel-box/camel-box-component/src/generated/resources/org/apache/camel/component/box/box.json
@@ -27,11 +27,11 @@
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
     "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "httpParams": { "kind": "property", "displayName": "Http Params", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "Custom HTTP params for settings like proxy host" },
+    "authenticationType": { "kind": "property", "displayName": "Authentication Type", "group": "authentication", "label": "authentication", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "APP_USER_AUTHENTICATION", "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The type of authentication for connection. Types of Authentication: STANDA [...]
     "accessTokenCache": { "kind": "property", "displayName": "Access Token Cache", "group": "security", "label": "advanced,security", "required": false, "type": "object", "javaType": "com.box.sdk.IAccessTokenCache", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "Custom Access Token Cache for storing and retrieving access tokens." },
     "clientSecret": { "kind": "property", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "Box application client secret" },
     "encryptionAlgorithm": { "kind": "property", "displayName": "Encryption Algorithm", "group": "security", "label": "advanced,security", "required": false, "type": "object", "javaType": "com.box.sdk.EncryptionAlgorithm", "enum": [ "RSA_SHA_256", "RSA_SHA_384", "RSA_SHA_512" ], "deprecated": false, "secret": false, "defaultValue": "RSA_SHA_256", "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The type of enc [...]
     "maxCacheEntries": { "kind": "property", "displayName": "Max Cache Entries", "group": "security", "label": "advanced,security", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "100", "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The maximum number of access tokens in cache." },
-    "authenticationType": { "kind": "property", "displayName": "Authentication Type", "group": "authentication", "label": "authentication", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "APP_USER_AUTHENTICATION", "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The type of authentication for connection. Types of Authentication: STANDA [...]
     "privateKeyFile": { "kind": "property", "displayName": "Private Key File", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The private key for generating the JWT signature." },
     "privateKeyPassword": { "kind": "property", "displayName": "Private Key Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The password for the private key." },
     "publicKeyId": { "kind": "property", "displayName": "Public Key Id", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The ID for public key for validating the JWT signature." },
@@ -55,25 +55,25 @@
     "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "httpParams": { "kind": "parameter", "displayName": "Http Params", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "Custom HTTP params for settings like proxy host" },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
-    "accessTokenCache": { "kind": "parameter", "displayName": "Access Token Cache", "group": "security", "label": "advanced,security", "required": false, "type": "object", "javaType": "com.box.sdk.IAccessTokenCache", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "Custom Access Token Cache for storing and retrieving access tokens." },
+    "authenticationType": { "kind": "parameter", "displayName": "Authentication Type", "group": "authentication", "label": "authentication", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "APP_USER_AUTHENTICATION", "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The type of authentication for connection. Types of Authentication: STAND [...]
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
     "delay": { "kind": "parameter", "displayName": "Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "500", "description": "Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour)." },
     "greedy": { "kind": "parameter", "displayName": "Greedy", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." },
+    "initialDelay": { "kind": "parameter", "displayName": "Initial Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "1000", "description": "Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour)." },
     "repeatCount": { "kind": "parameter", "displayName": "Repeat Count", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "0", "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." },
     "runLoggingLevel": { "kind": "parameter", "displayName": "Run Logging Level", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "secret": false, "defaultValue": "TRACE", "description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the logging level for that." },
     "scheduledExecutorService": { "kind": "parameter", "displayName": "Scheduled Executor Service", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "secret": false, "description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." },
     "scheduler": { "kind": "parameter", "displayName": "Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "none", "spring", "quartz" ], "deprecated": false, "secret": false, "defaultValue": "none", "description": "To use a cron scheduler from either camel-spring or camel-quartz component" },
     "schedulerProperties": { "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." },
+    "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
+    "accessTokenCache": { "kind": "parameter", "displayName": "Access Token Cache", "group": "security", "label": "advanced,security", "required": false, "type": "object", "javaType": "com.box.sdk.IAccessTokenCache", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "Custom Access Token Cache for storing and retrieving access tokens." },
     "clientSecret": { "kind": "parameter", "displayName": "Client Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "Box application client secret" },
     "encryptionAlgorithm": { "kind": "parameter", "displayName": "Encryption Algorithm", "group": "security", "label": "advanced,security", "required": false, "type": "object", "javaType": "com.box.sdk.EncryptionAlgorithm", "enum": [ "RSA_SHA_256", "RSA_SHA_384", "RSA_SHA_512" ], "deprecated": false, "secret": false, "defaultValue": "RSA_SHA_256", "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The type of en [...]
     "maxCacheEntries": { "kind": "parameter", "displayName": "Max Cache Entries", "group": "security", "label": "advanced,security", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "100", "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The maximum number of access tokens in cache." },
-    "authenticationType": { "kind": "parameter", "displayName": "Authentication Type", "group": "authentication", "label": "authentication", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "APP_USER_AUTHENTICATION", "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The type of authentication for connection. Types of Authentication: STAND [...]
-    "initialDelay": { "kind": "parameter", "displayName": "Initial Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "1000", "description": "Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour)." },
-    "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "privateKeyFile": { "kind": "parameter", "displayName": "Private Key File", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The private key for generating the JWT signature." },
     "privateKeyPassword": { "kind": "parameter", "displayName": "Private Key Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The password for the private key." },
     "publicKeyId": { "kind": "parameter", "displayName": "Public Key Id", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.box.BoxConfiguration", "configurationField": "configuration", "description": "The ID for public key for validating the JWT signature." },
diff --git a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
index 9c281e1..462cc15 100644
--- a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
+++ b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
@@ -67,11 +67,11 @@ The Box component supports 19 options, which are listed below.
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpParams* (advanced) | Custom HTTP params for settings like proxy host |  | Map
+| *authenticationType* (authentication) | The type of authentication for connection. Types of Authentication: STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION - OAuth 2.0 with JSON Web Tokens | APP_USER_AUTHENTICATION | String
 | *accessTokenCache* (security) | Custom Access Token Cache for storing and retrieving access tokens. |  | IAccessTokenCache
 | *clientSecret* (security) | Box application client secret |  | String
 | *encryptionAlgorithm* (security) | The type of encryption algorithm for JWT. Supported Algorithms: RSA_SHA_256 RSA_SHA_384 RSA_SHA_512. The value can be one of: RSA_SHA_256, RSA_SHA_384, RSA_SHA_512 | RSA_SHA_256 | EncryptionAlgorithm
 | *maxCacheEntries* (security) | The maximum number of access tokens in cache. | 100 | int
-| *authenticationType* (authentication) | The type of authentication for connection. Types of Authentication: STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION - OAuth 2.0 with JSON Web Tokens | APP_USER_AUTHENTICATION | String
 | *privateKeyFile* (security) | The private key for generating the JWT signature. |  | String
 | *privateKeyPassword* (security) | The password for the private key. |  | String
 | *publicKeyId* (security) | The ID for public key for validating the JWT signature. |  | String
@@ -120,25 +120,25 @@ with the following path and query parameters:
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpParams* (advanced) | Custom HTTP params for settings like proxy host |  | Map
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *accessTokenCache* (security) | Custom Access Token Cache for storing and retrieving access tokens. |  | IAccessTokenCache
+| *authenticationType* (authentication) | The type of authentication for connection. Types of Authentication: STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION - OAuth 2.0 with JSON Web Tokens | APP_USER_AUTHENTICATION | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
 | *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
 | *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *repeatCount* (scheduler) | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutorService
 | *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component. The value can be one of: none, spring, quartz | none | String
 | *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
+| *accessTokenCache* (security) | Custom Access Token Cache for storing and retrieving access tokens. |  | IAccessTokenCache
 | *clientSecret* (security) | Box application client secret |  | String
 | *encryptionAlgorithm* (security) | The type of encryption algorithm for JWT. Supported Algorithms: RSA_SHA_256 RSA_SHA_384 RSA_SHA_512. The value can be one of: RSA_SHA_256, RSA_SHA_384, RSA_SHA_512 | RSA_SHA_256 | EncryptionAlgorithm
 | *maxCacheEntries* (security) | The maximum number of access tokens in cache. | 100 | int
-| *authenticationType* (authentication) | The type of authentication for connection. Types of Authentication: STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION - OAuth 2.0 with JSON Web Tokens | APP_USER_AUTHENTICATION | String
-| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
-| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *privateKeyFile* (security) | The private key for generating the JWT signature. |  | String
 | *privateKeyPassword* (security) | The password for the private key. |  | String
 | *publicKeyId* (security) | The ID for public key for validating the JWT signature. |  | String
diff --git a/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json b/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
index 28986b8..5cdcfc6 100644
--- a/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
+++ b/components/camel-braintree/src/generated/resources/org/apache/camel/component/braintree/braintree.json
@@ -39,6 +39,11 @@
     "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "httpReadTimeout": { "kind": "parameter", "displayName": "Http Read Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Set read timeout for http calls." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "httpLogLevel": { "kind": "parameter", "displayName": "Http Log Level", "group": "logging", "label": "logging", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Set logging level for http calls, see java.util.logging.Level" },
+    "httpLogName": { "kind": "parameter", "displayName": "Http Log Name", "group": "logging", "label": "logging", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Braintree", "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Set log category to use to log http calls." },
+    "logHandlerEnabled": { "kind": "parameter", "displayName": "Log Handler Enabled", "group": "logging", "label": "logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an exi [...]
+    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The proxy host" },
+    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The proxy port" },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
@@ -53,11 +58,6 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "httpLogLevel": { "kind": "parameter", "displayName": "Http Log Level", "group": "logging", "label": "logging", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Set logging level for http calls, see java.util.logging.Level" },
-    "httpLogName": { "kind": "parameter", "displayName": "Http Log Name", "group": "logging", "label": "logging", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Braintree", "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Set log category to use to log http calls." },
-    "logHandlerEnabled": { "kind": "parameter", "displayName": "Log Handler Enabled", "group": "logging", "label": "logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an exi [...]
-    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The proxy host" },
-    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The proxy port" },
     "accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The access token granted by a merchant to another in order to process transactions on their behalf. Used in place of environment, m [...]
     "privateKey": { "kind": "parameter", "displayName": "Private Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The private key provided by Braintree." },
     "publicKey": { "kind": "parameter", "displayName": "Public Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.braintree.BraintreeConfiguration", "configurationField": "configuration", "description": "The public key provided by Braintree." }
diff --git a/components/camel-braintree/src/main/docs/braintree-component.adoc b/components/camel-braintree/src/main/docs/braintree-component.adoc
index 9aeb4dc..9d4de37 100644
--- a/components/camel-braintree/src/main/docs/braintree-component.adoc
+++ b/components/camel-braintree/src/main/docs/braintree-component.adoc
@@ -96,6 +96,11 @@ with the following path and query parameters:
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpReadTimeout* (advanced) | Set read timeout for http calls. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *httpLogLevel* (logging) | Set logging level for http calls, see java.util.logging.Level |  | String
+| *httpLogName* (logging) | Set log category to use to log http calls. | Braintree | String
+| *logHandlerEnabled* (logging) | Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an existing JUL - SLF4J logger bridge is on the classpath. This option can also be configured globally on the BraintreeComponent. | true | boolean
+| *proxyHost* (proxy) | The proxy host |  | String
+| *proxyPort* (proxy) | The proxy port |  | Integer
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -110,11 +115,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *httpLogLevel* (logging) | Set logging level for http calls, see java.util.logging.Level |  | String
-| *httpLogName* (logging) | Set log category to use to log http calls. | Braintree | String
-| *logHandlerEnabled* (logging) | Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an existing JUL - SLF4J logger bridge is on the classpath. This option can also be configured globally on the BraintreeComponent. | true | boolean
-| *proxyHost* (proxy) | The proxy host |  | String
-| *proxyPort* (proxy) | The proxy port |  | Integer
 | *accessToken* (security) | The access token granted by a merchant to another in order to process transactions on their behalf. Used in place of environment, merchant id, public key and private key fields. |  | String
 | *privateKey* (security) | The private key provided by Braintree. |  | String
 | *publicKey* (security) | The public key provided by Braintree. |  | String
diff --git a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
index 56284bd..74be11d 100644
--- a/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
+++ b/components/camel-consul/src/generated/resources/org/apache/camel/component/consul/consul.json
@@ -37,14 +37,14 @@
     "datacenter": { "kind": "property", "displayName": "Datacenter", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The data center" },
     "nearNode": { "kind": "property", "displayName": "Near Node", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The near node to use for queries." },
     "nodeMeta": { "kind": "property", "displayName": "Node Meta", "group": "advanced", "label": "advanced", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The note meta-data to use for queries." },
-    "blockSeconds": { "kind": "property", "displayName": "Block Seconds", "group": "watch", "label": "consumer,watch", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The second to wait for a watch event, default 10 seconds" },
-    "firstIndex": { "kind": "property", "displayName": "First Index", "group": "watch", "label": "consumer,watch", "required": false, "type": "object", "javaType": "java.math.BigInteger", "deprecated": false, "secret": false, "defaultValue": "0", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The first index for watch for, default 0" },
-    "recursive": { "kind": "property", "displayName": "Recursive", "group": "watch", "label": "consumer,watch", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Recursively watch, default false" },
     "aclToken": { "kind": "property", "displayName": "Acl Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Sets the ACL token to be used with Consul" },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Sets the password to be used for basic authentication" },
     "sslContextParameters": { "kind": "property", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters instance." },
     "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enable usage of global SSL context parameters." },
-    "userName": { "kind": "property", "displayName": "User Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Sets the username to be used for basic authentication" }
+    "userName": { "kind": "property", "displayName": "User Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Sets the username to be used for basic authentication" },
+    "blockSeconds": { "kind": "property", "displayName": "Block Seconds", "group": "watch", "label": "consumer,watch", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The second to wait for a watch event, default 10 seconds" },
+    "firstIndex": { "kind": "property", "displayName": "First Index", "group": "watch", "label": "consumer,watch", "required": false, "type": "object", "javaType": "java.math.BigInteger", "deprecated": false, "secret": false, "defaultValue": "0", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The first index for watch for, default 0" },
+    "recursive": { "kind": "property", "displayName": "Recursive", "group": "watch", "label": "consumer,watch", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Recursively watch, default false" }
   },
   "properties": {
     "apiEndpoint": { "kind": "path", "displayName": "Api Endpoint", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The API endpoint" },
@@ -68,12 +68,12 @@
     "nearNode": { "kind": "parameter", "displayName": "Near Node", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The near node to use for queries." },
     "nodeMeta": { "kind": "parameter", "displayName": "Node Meta", "group": "advanced", "label": "advanced", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The note meta-data to use for queries." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
-    "blockSeconds": { "kind": "parameter", "displayName": "Block Seconds", "group": "watch", "label": "consumer,watch", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The second to wait for a watch event, default 10 seconds" },
-    "firstIndex": { "kind": "parameter", "displayName": "First Index", "group": "watch", "label": "consumer,watch", "required": false, "type": "object", "javaType": "java.math.BigInteger", "deprecated": false, "secret": false, "defaultValue": "0", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The first index for watch for, default 0" },
-    "recursive": { "kind": "parameter", "displayName": "Recursive", "group": "watch", "label": "consumer,watch", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Recursively watch, default false" },
     "aclToken": { "kind": "parameter", "displayName": "Acl Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Sets the ACL token to be used with Consul" },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Sets the password to be used for basic authentication" },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters insta [...]
-    "userName": { "kind": "parameter", "displayName": "User Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Sets the username to be used for basic authentication" }
+    "userName": { "kind": "parameter", "displayName": "User Name", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Sets the username to be used for basic authentication" },
+    "blockSeconds": { "kind": "parameter", "displayName": "Block Seconds", "group": "watch", "label": "consumer,watch", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The second to wait for a watch event, default 10 seconds" },
+    "firstIndex": { "kind": "parameter", "displayName": "First Index", "group": "watch", "label": "consumer,watch", "required": false, "type": "object", "javaType": "java.math.BigInteger", "deprecated": false, "secret": false, "defaultValue": "0", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The first index for watch for, default 0" },
+    "recursive": { "kind": "parameter", "displayName": "Recursive", "group": "watch", "label": "consumer,watch", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Recursively watch, default false" }
   }
 }
diff --git a/components/camel-consul/src/main/docs/consul-component.adoc b/components/camel-consul/src/main/docs/consul-component.adoc
index 9acacd1..5a6e87c 100644
--- a/components/camel-consul/src/main/docs/consul-component.adoc
+++ b/components/camel-consul/src/main/docs/consul-component.adoc
@@ -65,14 +65,14 @@ The Consul component supports 26 options, which are listed below.
 | *datacenter* (advanced) | The data center |  | String
 | *nearNode* (advanced) | The near node to use for queries. |  | String
 | *nodeMeta* (advanced) | The note meta-data to use for queries. |  | List
-| *blockSeconds* (watch) | The second to wait for a watch event, default 10 seconds | 10 | Integer
-| *firstIndex* (watch) | The first index for watch for, default 0 | 0 | BigInteger
-| *recursive* (watch) | Recursively watch, default false | false | boolean
 | *aclToken* (security) | Sets the ACL token to be used with Consul |  | String
 | *password* (security) | Sets the password to be used for basic authentication |  | String
 | *sslContextParameters* (security) | SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters instance. |  | SSLContextParameters
 | *useGlobalSslContextParameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *userName* (security) | Sets the username to be used for basic authentication |  | String
+| *blockSeconds* (watch) | The second to wait for a watch event, default 10 seconds | 10 | Integer
+| *firstIndex* (watch) | The first index for watch for, default 0 | 0 | BigInteger
+| *recursive* (watch) | Recursively watch, default false | false | boolean
 |===
 // component options: END
 
@@ -126,13 +126,13 @@ with the following path and query parameters:
 | *nearNode* (advanced) | The near node to use for queries. |  | String
 | *nodeMeta* (advanced) | The note meta-data to use for queries. |  | List
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *blockSeconds* (watch) | The second to wait for a watch event, default 10 seconds | 10 | Integer
-| *firstIndex* (watch) | The first index for watch for, default 0 | 0 | BigInteger
-| *recursive* (watch) | Recursively watch, default false | false | boolean
 | *aclToken* (security) | Sets the ACL token to be used with Consul |  | String
 | *password* (security) | Sets the password to be used for basic authentication |  | String
 | *sslContextParameters* (security) | SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters instance. |  | SSLContextParameters
 | *userName* (security) | Sets the username to be used for basic authentication |  | String
+| *blockSeconds* (watch) | The second to wait for a watch event, default 10 seconds | 10 | Integer
+| *firstIndex* (watch) | The first index for watch for, default 0 | 0 | BigInteger
+| *recursive* (watch) | Recursively watch, default false | false | boolean
 |===
 // endpoint options: END
 
diff --git a/components/camel-elytron/src/generated/resources/org/apache/camel/component/elytron/elytron.json b/components/camel-elytron/src/generated/resources/org/apache/camel/component/elytron/elytron.json
index d2946cd..8897b51 100644
--- a/components/camel-elytron/src/generated/resources/org/apache/camel/component/elytron/elytron.json
+++ b/components/camel-elytron/src/generated/resources/org/apache/camel/component/elytron/elytron.json
@@ -59,9 +59,9 @@
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "undertowHttpBinding": { "kind": "parameter", "displayName": "Undertow Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.undertow.UndertowHttpBinding", "deprecated": false, "secret": false, "description": "To use a custom UndertowHttpBinding to control the mapping between Camel message and undertow." },
+    "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters" },
     "fireWebSocketChannelEvents": { "kind": "parameter", "displayName": "Fire Web Socket Channel Events", "group": "websocket", "label": "consumer,websocket", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "if true, the consumer will post notifications to the route when a new WebSocket peer connects, disconnects, etc. See UndertowConstants.EVENT_TYPE and EventType." },
     "sendTimeout": { "kind": "parameter", "displayName": "Send Timeout", "group": "websocket", "label": "producer,websocket", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "30000", "description": "Timeout in milliseconds when sending to a websocket channel. The default timeout is 30000 (30 seconds)." },
-    "sendToAll": { "kind": "parameter", "displayName": "Send To All", "group": "websocket", "label": "producer,websocket", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the UndertowConstants.SEND_TO_ALL header on the message." },
-    "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters" }
+    "sendToAll": { "kind": "parameter", "displayName": "Send To All", "group": "websocket", "label": "producer,websocket", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the UndertowConstants.SEND_TO_ALL header on the message." }
   }
 }
diff --git a/components/camel-elytron/src/main/docs/elytron-component.adoc b/components/camel-elytron/src/main/docs/elytron-component.adoc
index dd52ab2..e46214b 100644
--- a/components/camel-elytron/src/main/docs/elytron-component.adoc
+++ b/components/camel-elytron/src/main/docs/elytron-component.adoc
@@ -121,10 +121,10 @@ with the following path and query parameters:
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *undertowHttpBinding* (advanced) | To use a custom UndertowHttpBinding to control the mapping between Camel message and undertow. |  | UndertowHttpBinding
+| *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 | *fireWebSocketChannelEvents* (websocket) | if true, the consumer will post notifications to the route when a new WebSocket peer connects, disconnects, etc. See UndertowConstants.EVENT_TYPE and EventType. | false | boolean
 | *sendTimeout* (websocket) | Timeout in milliseconds when sending to a websocket channel. The default timeout is 30000 (30 seconds). | 30000 | Integer
 | *sendToAll* (websocket) | To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the UndertowConstants.SEND_TO_ALL header on the message. |  | Boolean
-| *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
 // endpoint options: END
 
diff --git a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
index e965522..9a86ec5 100644
--- a/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
+++ b/components/camel-fhir/camel-fhir-component/src/generated/resources/org/apache/camel/component/fhir/fhir.json
@@ -75,6 +75,10 @@
     "summary": { "kind": "parameter", "displayName": "Summary", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "COUNT", "TEXT", "DATA", "TRUE", "FALSE" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "Request that the server modify the response using the _summary param" },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "validationMode": { "kind": "parameter", "displayName": "Validation Mode", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "NEVER", "ONCE" ], "deprecated": false, "secret": false, "defaultValue": "ONCE", "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "When should Camel validate the FHIR Server's conformance statement" },
+    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy host" },
+    "proxyPassword": { "kind": "parameter", "displayName": "Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy password" },
+    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy port" },
+    "proxyUser": { "kind": "parameter", "displayName": "Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy username" },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
@@ -89,10 +93,6 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy host" },
-    "proxyPassword": { "kind": "parameter", "displayName": "Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy password" },
-    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy port" },
-    "proxyUser": { "kind": "parameter", "displayName": "Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "The proxy username" },
     "accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "OAuth access token" },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "Username to use for basic authentication" },
     "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.fhir.FhirConfiguration", "configurationField": "configuration", "description": "Username to use for basic authentication" }
diff --git a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
index d861954..a63b009 100644
--- a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
+++ b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
@@ -140,6 +140,10 @@ with the following path and query parameters:
 | *summary* (advanced) | Request that the server modify the response using the _summary param. The value can be one of: COUNT, TEXT, DATA, TRUE, FALSE |  | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *validationMode* (advanced) | When should Camel validate the FHIR Server's conformance statement. The value can be one of: NEVER, ONCE | ONCE | String
+| *proxyHost* (proxy) | The proxy host |  | String
+| *proxyPassword* (proxy) | The proxy password |  | String
+| *proxyPort* (proxy) | The proxy port |  | Integer
+| *proxyUser* (proxy) | The proxy username |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -154,10 +158,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *proxyHost* (proxy) | The proxy host |  | String
-| *proxyPassword* (proxy) | The proxy password |  | String
-| *proxyPort* (proxy) | The proxy port |  | Integer
-| *proxyUser* (proxy) | The proxy username |  | String
 | *accessToken* (security) | OAuth access token |  | String
 | *password* (security) | Username to use for basic authentication |  | String
 | *username* (security) | Username to use for basic authentication |  | String
diff --git a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/ftp.json b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/ftp.json
index d6c2825..c384d42 100644
--- a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/ftp.json
+++ b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/ftp.json
@@ -132,11 +132,11 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "shuffle": { "kind": "parameter", "displayName": "Shuffle", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To shuffle the list of files (sort in random order)" },
-    "sortBy": { "kind": "parameter", "displayName": "Sort By", "group": "sort", "label": "consumer,sort", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date." },
-    "sorter": { "kind": "parameter", "displayName": "Sorter", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.commons.net.ftp.FTPFile>>", "deprecated": false, "secret": false, "description": "Pluggable sorter as a java.util.Comparator class." },
     "account": { "kind": "parameter", "displayName": "Account", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.FtpConfiguration", "configurationField": "configuration", "description": "Account to use for login" },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.FtpConfiguration", "configurationField": "configuration", "description": "Password to use for login" },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.FtpConfiguration", "configurationField": "configuration", "description": "Username to use for login" }
+    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.FtpConfiguration", "configurationField": "configuration", "description": "Username to use for login" },
+    "shuffle": { "kind": "parameter", "displayName": "Shuffle", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To shuffle the list of files (sort in random order)" },
+    "sortBy": { "kind": "parameter", "displayName": "Sort By", "group": "sort", "label": "consumer,sort", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date." },
+    "sorter": { "kind": "parameter", "displayName": "Sorter", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.commons.net.ftp.FTPFile>>", "deprecated": false, "secret": false, "description": "Pluggable sorter as a java.util.Comparator class." }
   }
 }
diff --git a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/ftps.json b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/ftps.json
index 7783c09..6fc918f 100644
--- a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/ftps.json
+++ b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/ftps.json
@@ -133,9 +133,6 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "shuffle": { "kind": "parameter", "displayName": "Shuffle", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To shuffle the list of files (sort in random order)" },
-    "sortBy": { "kind": "parameter", "displayName": "Sort By", "group": "sort", "label": "consumer,sort", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date." },
-    "sorter": { "kind": "parameter", "displayName": "Sorter", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.commons.net.ftp.FTPFile>>", "deprecated": false, "secret": false, "description": "Pluggable sorter as a java.util.Comparator class." },
     "account": { "kind": "parameter", "displayName": "Account", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.FtpsConfiguration", "configurationField": "configuration", "description": "Account to use for login" },
     "disableSecureDataChannelDefaults": { "kind": "parameter", "displayName": "Disable Secure Data Channel Defaults", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.file.remote.FtpsConfiguration", "configurationField": "configuration", "description": "Use this option to disable default options when using secure data channel [...]
     "execPbsz": { "kind": "parameter", "displayName": "Exec Pbsz", "group": "security", "label": "security", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.FtpsConfiguration", "configurationField": "configuration", "description": "When using secure data channel you can set the exec protection buffer size" },
@@ -146,6 +143,9 @@
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.FtpsConfiguration", "configurationField": "configuration", "description": "Password to use for login" },
     "securityProtocol": { "kind": "parameter", "displayName": "Security Protocol", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "TLSv1.2", "configurationClass": "org.apache.camel.component.file.remote.FtpsConfiguration", "configurationField": "configuration", "description": "Set the underlying security protocol." },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "Gets the JSSE configuration that overrides any settings in FtpsEndpoint#ftpClientKeyStoreParameters, ftpClientTrustStoreParameters, and FtpsConfiguration#getSecurityProtocol()." },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.FtpsConfiguration", "configurationField": "configuration", "description": "Username to use for login" }
+    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.FtpsConfiguration", "configurationField": "configuration", "description": "Username to use for login" },
+    "shuffle": { "kind": "parameter", "displayName": "Shuffle", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To shuffle the list of files (sort in random order)" },
+    "sortBy": { "kind": "parameter", "displayName": "Sort By", "group": "sort", "label": "consumer,sort", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date." },
+    "sorter": { "kind": "parameter", "displayName": "Sorter", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.commons.net.ftp.FTPFile>>", "deprecated": false, "secret": false, "description": "Pluggable sorter as a java.util.Comparator class." }
   }
 }
diff --git a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json
index 3e30e74..c64a93f 100644
--- a/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json
+++ b/components/camel-ftp/src/generated/resources/org/apache/camel/component/file/remote/sftp.json
@@ -130,9 +130,6 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "shuffle": { "kind": "parameter", "displayName": "Shuffle", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To shuffle the list of files (sort in random order)" },
-    "sortBy": { "kind": "parameter", "displayName": "Sort By", "group": "sort", "label": "consumer,sort", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date." },
-    "sorter": { "kind": "parameter", "displayName": "Sorter", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.camel.component.file.remote.SftpRemoteFile>>", "deprecated": false, "secret": false, "description": "Pluggable sorter as a java.util.Comparator class." },
     "ciphers": { "kind": "parameter", "displayName": "Ciphers", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set a comma separated list of ciphers that will be used in order of preference. Possible cipher names are defined by JCraft JSCH. Some example [...]
     "keyPair": { "kind": "parameter", "displayName": "Key Pair", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "java.security.KeyPair", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets a key pair of the public and private key so to that the SFTP endpoint can do public\/private key verification." },
     "knownHosts": { "kind": "parameter", "displayName": "Known Hosts", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "byte[]", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets the known_hosts from the byte array, so that the SFTP endpoint can do host key verification." },
@@ -146,6 +143,9 @@
     "privateKeyUri": { "kind": "parameter", "displayName": "Private Key Uri", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Set the private key file (loaded from classpath by default) so that the SFTP endpoint can do private key verification." },
     "strictHostKeyChecking": { "kind": "parameter", "displayName": "Strict Host Key Checking", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "no", "yes" ], "deprecated": false, "secret": false, "defaultValue": "no", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets whether to use strict host key checking." },
     "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Username to use for login" },
-    "useUserKnownHostsFile": { "kind": "parameter", "displayName": "Use User Known Hosts File", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "If knownHostFile has not been explicit configured then use the host file from System.getProper [...]
+    "useUserKnownHostsFile": { "kind": "parameter", "displayName": "Use User Known Hosts File", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "If knownHostFile has not been explicit configured then use the host file from System.getProper [...]
+    "shuffle": { "kind": "parameter", "displayName": "Shuffle", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "To shuffle the list of files (sort in random order)" },
+    "sortBy": { "kind": "parameter", "displayName": "Sort By", "group": "sort", "label": "consumer,sort", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date." },
+    "sorter": { "kind": "parameter", "displayName": "Sorter", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.camel.component.file.remote.SftpRemoteFile>>", "deprecated": false, "secret": false, "description": "Pluggable sorter as a java.util.Comparator class." }
   }
 }
diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc
index b1bee1a..b14da7a 100644
--- a/components/camel-ftp/src/main/docs/ftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftp-component.adoc
@@ -217,12 +217,12 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
-| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
-| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 | *account* (security) | Account to use for login |  | String
 | *password* (security) | Password to use for login |  | String
 | *username* (security) | Username to use for login |  | String
+| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
+| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
+| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 |===
 // endpoint options: END
 
diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc b/components/camel-ftp/src/main/docs/ftps-component.adoc
index eaf2a62..2d96a13 100644
--- a/components/camel-ftp/src/main/docs/ftps-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftps-component.adoc
@@ -176,9 +176,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
-| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
-| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 | *account* (security) | Account to use for login |  | String
 | *disableSecureDataChannel Defaults* (security) | Use this option to disable default options when using secure data channel. This allows you to be in full control what the execPbsz and execProt setting should be used. Default is false | false | boolean
 | *execPbsz* (security) | When using secure data channel you can set the exec protection buffer size |  | Long
@@ -190,6 +187,9 @@ with the following path and query parameters:
 | *securityProtocol* (security) | Set the underlying security protocol. | TLSv1.2 | String
 | *sslContextParameters* (security) | Gets the JSSE configuration that overrides any settings in FtpsEndpoint#\ftpClientKeyStoreParameters, \ftpClientTrustStoreParameters, and FtpsConfiguration#getSecurityProtocol(). |  | SSLContextParameters
 | *username* (security) | Username to use for login |  | String
+| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
+| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
+| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 |===
 // endpoint options: END
 
diff --git a/components/camel-ftp/src/main/docs/sftp-component.adoc b/components/camel-ftp/src/main/docs/sftp-component.adoc
index d94e406..7ecf485 100644
--- a/components/camel-ftp/src/main/docs/sftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/sftp-component.adoc
@@ -174,9 +174,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
-| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
-| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 | *ciphers* (security) | Set a comma separated list of ciphers that will be used in order of preference. Possible cipher names are defined by JCraft JSCH. Some examples include: aes128-ctr,aes128-cbc,3des-ctr,3des-cbc,blowfish-cbc,aes192-cbc,aes256-cbc. If not specified the default list from JSCH will be used. |  | String
 | *keyPair* (security) | Sets a key pair of the public and private key so to that the SFTP endpoint can do public/private key verification. |  | KeyPair
 | *knownHosts* (security) | Sets the known_hosts from the byte array, so that the SFTP endpoint can do host key verification. |  | byte[]
@@ -191,6 +188,9 @@ with the following path and query parameters:
 | *strictHostKeyChecking* (security) | Sets whether to use strict host key checking. The value can be one of: no, yes | no | String
 | *username* (security) | Username to use for login |  | String
 | *useUserKnownHostsFile* (security) | If knownHostFile has not been explicit configured then use the host file from System.getProperty(user.home)/.ssh/known_hosts | true | boolean
+| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
+| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
+| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 |===
 // endpoint options: END
 
diff --git a/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json b/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
index 063c37b..1a52e41 100644
--- a/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
+++ b/components/camel-google-pubsub/src/generated/resources/org/apache/camel/component/google/pubsub/google-pubsub.json
@@ -5,7 +5,7 @@
     "extendsScheme": "",
     "syntax": "google-pubsub:projectId:destinationName",
     "title": "Google Pubsub",
-    "description": "Messaging client for Google Cloud Platform PubSub Service",
+    "description": "Messaging client for Google Cloud Platform PubSub Service Built on top of the Google Cloud Pub\/Sub libraries.",
     "label": "messaging",
     "deprecated": false,
     "async": false,
diff --git a/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json b/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
index 78f3f7f..2e75b93 100644
--- a/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
+++ b/components/camel-jms/src/generated/resources/org/apache/camel/component/jms/jms.json
@@ -104,9 +104,9 @@
     "useMessageIDAsCorrelationID": { "kind": "property", "displayName": "Use Message IDAs Correlation ID", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages." },
     "waitForProvisionCorrelationToBeUpdatedCounter": { "kind": "property", "displayName": "Wait For Provision Correlation To Be Updated Counter", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "50", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Number of times to wait for provisional correlation id to b [...]
     "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": { "kind": "property", "displayName": "Wait For Provision Correlation To Be Updated Thread Sleeping Time", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "100", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Interval in millis to sleep each  [...]
+    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "errorHandlerLoggingLevel": { "kind": "property", "displayName": "Error Handler Logging Level", "group": "logging", "label": "consumer,logging", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "secret": false, "defaultValue": "WARN", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows to [...]
     "errorHandlerLogStackTrace": { "kind": "property", "displayName": "Error Handler Log Stack Trace", "group": "logging", "label": "consumer,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Allows to control whether stacktraces should be logged or not, by the default errorHandler." },
-    "headerFilterStrategy": { "kind": "property", "displayName": "Header Filter Strategy", "group": "filter", "label": "filter", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message." },
     "password": { "kind": "property", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Password to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
     "username": { "kind": "property", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Username to use with the ConnectionFactory. You can also configure username\/password directly on the ConnectionFactory." },
     "transacted": { "kind": "property", "displayName": "Transacted", "group": "transaction", "label": "transaction", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration", "configurationField": "configuration", "description": "Specifies whether to use transacted mode" },
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index f7592ef..3b6ac86 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -274,9 +274,9 @@ The JMS component supports 95 options, which are listed below.
 | *useMessageIDAsCorrelationID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
 | *waitForProvisionCorrelationTo BeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
 | *waitForProvisionCorrelationTo BeUpdatedThreadSleepingTime* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
+| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
-| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
diff --git a/components/camel-jmx/src/generated/resources/org/apache/camel/component/jmx/jmx.json b/components/camel-jmx/src/generated/resources/org/apache/camel/component/jmx/jmx.json
index 40b74ee..6f90f42 100644
--- a/components/camel-jmx/src/generated/resources/org/apache/camel/component/jmx/jmx.json
+++ b/components/camel-jmx/src/generated/resources/org/apache/camel/component/jmx/jmx.json
@@ -42,9 +42,6 @@
     "reconnectOnConnectionFailure": { "kind": "parameter", "displayName": "Reconnect On Connection Failure", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If true the consumer will attempt to reconnect to the JMX server when any connection failure occurs. The consumer will attempt to re-establish the JMX connection every 'x' seconds until the connection is [...]
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "testConnectionOnStartup": { "kind": "parameter", "displayName": "Test Connection On Startup", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "If true the consumer will throw an exception if unable to establish the JMX connection upon startup. If false, the consumer will attempt to establish the JMX connection every 'x' seconds until the connection is m [...]
-    "notifyDiffer": { "kind": "parameter", "displayName": "Notify Differ", "group": "string", "label": "consumer,string", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If true, will fire a notification when the string attribute differs from the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured." },
-    "notifyMatch": { "kind": "parameter", "displayName": "Notify Match", "group": "string", "label": "consumer,string", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If true, will fire a notification when the string attribute matches the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured." },
-    "stringToCompare": { "kind": "parameter", "displayName": "String To Compare", "group": "string", "label": "consumer,string", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Value for attribute to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured." },
     "initThreshold": { "kind": "parameter", "displayName": "Init Threshold", "group": "counter", "label": "counter", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Initial threshold for the monitor. The value must exceed this before notifications are fired (counter monitor only)." },
     "modulus": { "kind": "parameter", "displayName": "Modulus", "group": "counter", "label": "counter", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The value at which the counter is reset to zero (counter monitor only)." },
     "offset": { "kind": "parameter", "displayName": "Offset", "group": "counter", "label": "counter", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The amount to increment the threshold after it's been exceeded (counter monitor only)." },
@@ -54,6 +51,9 @@
     "thresholdHigh": { "kind": "parameter", "displayName": "Threshold High", "group": "gauge", "label": "gauge", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "secret": false, "description": "Value for the gauge's high threshold (gauge monitor only)." },
     "thresholdLow": { "kind": "parameter", "displayName": "Threshold Low", "group": "gauge", "label": "gauge", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "secret": false, "description": "Value for the gauge's low threshold (gauge monitor only)." },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Credentials for making a remote connection" },
-    "user": { "kind": "parameter", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Credentials for making a remote connection" }
+    "user": { "kind": "parameter", "displayName": "User", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Credentials for making a remote connection" },
+    "notifyDiffer": { "kind": "parameter", "displayName": "Notify Differ", "group": "string", "label": "consumer,string", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If true, will fire a notification when the string attribute differs from the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured." },
+    "notifyMatch": { "kind": "parameter", "displayName": "Notify Match", "group": "string", "label": "consumer,string", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If true, will fire a notification when the string attribute matches the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured." },
+    "stringToCompare": { "kind": "parameter", "displayName": "String To Compare", "group": "string", "label": "consumer,string", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Value for attribute to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured." }
   }
 }
diff --git a/components/camel-jmx/src/main/docs/jmx-component.adoc b/components/camel-jmx/src/main/docs/jmx-component.adoc
index c532a22..eacaf4d 100644
--- a/components/camel-jmx/src/main/docs/jmx-component.adoc
+++ b/components/camel-jmx/src/main/docs/jmx-component.adoc
@@ -73,9 +73,6 @@ with the following path and query parameters:
 | *reconnectOnConnectionFailure* (advanced) | If true the consumer will attempt to reconnect to the JMX server when any connection failure occurs. The consumer will attempt to re-establish the JMX connection every 'x' seconds until the connection is made-- where 'x' is the configured reconnectionDelay | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *testConnectionOnStartup* (advanced) | If true the consumer will throw an exception if unable to establish the JMX connection upon startup. If false, the consumer will attempt to establish the JMX connection every 'x' seconds until the connection is made -- where 'x' is the configured reconnectionDelay | true | boolean
-| *notifyDiffer* (string) | If true, will fire a notification when the string attribute differs from the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. | false | boolean
-| *notifyMatch* (string) | If true, will fire a notification when the string attribute matches the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. | false | boolean
-| *stringToCompare* (string) | Value for attribute to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. |  | String
 | *initThreshold* (counter) | Initial threshold for the monitor. The value must exceed this before notifications are fired (counter monitor only). |  | int
 | *modulus* (counter) | The value at which the counter is reset to zero (counter monitor only). |  | int
 | *offset* (counter) | The amount to increment the threshold after it's been exceeded (counter monitor only). |  | int
@@ -86,6 +83,9 @@ with the following path and query parameters:
 | *thresholdLow* (gauge) | Value for the gauge's low threshold (gauge monitor only). |  | Double
 | *password* (security) | Credentials for making a remote connection |  | String
 | *user* (security) | Credentials for making a remote connection |  | String
+| *notifyDiffer* (string) | If true, will fire a notification when the string attribute differs from the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. | false | boolean
+| *notifyMatch* (string) | If true, will fire a notification when the string attribute matches the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. | false | boolean
+| *stringToCompare* (string) | Value for attribute to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. |  | String
 |===
 // endpoint options: END
 
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imap.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imap.json
index 36643aa..4be7b3d 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imap.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imap.json
@@ -128,9 +128,9 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login" },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To configure security using SSLContextParameters." },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" }
+    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" },
+    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." }
   }
 }
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imaps.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imaps.json
index 90c5644..b1d3be7 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imaps.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/imaps.json
@@ -128,9 +128,9 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login" },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To configure security using SSLContextParameters." },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" }
+    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" },
+    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." }
   }
 }
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3.json
index 6812da82..4601a58 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3.json
@@ -128,9 +128,9 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login" },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To configure security using SSLContextParameters." },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" }
+    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" },
+    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." }
   }
 }
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3s.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3s.json
index a9f2460..db8139a 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3s.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/pop3s.json
@@ -128,9 +128,9 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login" },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To configure security using SSLContextParameters." },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" }
+    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" },
+    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." }
   }
 }
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtp.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtp.json
index e9b36be..12bc29a 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtp.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtp.json
@@ -128,9 +128,9 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login" },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To configure security using SSLContextParameters." },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" }
+    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" },
+    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." }
   }
 }
diff --git a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtps.json b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtps.json
index 4fea0bb..1ae5274 100644
--- a/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtps.json
+++ b/components/camel-mail/src/generated/resources/org/apache/camel/component/mail/smtps.json
@@ -128,9 +128,9 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." },
     "password": { "kind": "parameter", "displayName": "Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The password for login" },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "To configure security using SSLContextParameters." },
-    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" }
+    "username": { "kind": "parameter", "displayName": "Username", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.mail.MailConfiguration", "configurationField": "configuration", "description": "The username for login" },
+    "sortTerm": { "kind": "parameter", "displayName": "Sort Term", "group": "sort", "label": "consumer,sort", "required": false, "type": "object", "javaType": "com.sun.mail.imap.SortTerm[]", "deprecated": false, "secret": false, "description": "Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability." }
   }
 }
diff --git a/components/camel-mail/src/main/docs/mail-component.adoc b/components/camel-mail/src/main/docs/mail-component.adoc
index 008767a..addbb30 100644
--- a/components/camel-mail/src/main/docs/mail-component.adoc
+++ b/components/camel-mail/src/main/docs/mail-component.adoc
@@ -237,10 +237,10 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *sortTerm* (sort) | Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability. |  | SortTerm[]
 | *password* (security) | The password for login |  | String
 | *sslContextParameters* (security) | To configure security using SSLContextParameters. |  | SSLContextParameters
 | *username* (security) | The username for login |  | String
+| *sortTerm* (sort) | Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability. |  | SortTerm[]
 |===
 // endpoint options: END
 
diff --git a/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json b/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json
index e8d6228..6f0c243 100644
--- a/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json
+++ b/components/camel-mllp/src/generated/resources/org/apache/camel/component/mllp/mllp.json
@@ -41,22 +41,22 @@
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
     "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets whether synchronous processing should be strictly used (this component only supports synchronous operations)." },
+    "charsetName": { "kind": "parameter", "displayName": "Charset Name", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Set the CamelCharsetName property on the exchange" },
     "backlog": { "kind": "parameter", "displayName": "Backlog", "group": "tcp", "label": "advanced,consumer,tcp", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "5", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The maximum queue length for incoming connection indications (a request to connect) is set to the backlog parameter. I [...]
+    "keepAlive": { "kind": "parameter", "displayName": "Keep Alive", "group": "tcp", "label": "advanced,producer,tcp", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/disable the SO_KEEPALIVE socket option." },
     "lenientBind": { "kind": "parameter", "displayName": "Lenient Bind", "group": "tcp", "label": "advanced,consumer,tcp", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "TCP Server Only - Allow the endpoint to start before the TCP ServerSocket is bound. In some environments, it may be [...]
     "maxConcurrentConsumers": { "kind": "parameter", "displayName": "Max Concurrent Consumers", "group": "tcp", "label": "advanced,consumer,tcp", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "5", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The maximum number of concurrent MLLP Consumer connections that will be allowed. If a new connection [...]
+    "receiveBufferSize": { "kind": "parameter", "displayName": "Receive Buffer Size", "group": "tcp", "label": "advanced,tcp", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "8192", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SO_RCVBUF option to the specified value (in bytes)" },
     "reuseAddress": { "kind": "parameter", "displayName": "Reuse Address", "group": "tcp", "label": "advanced,consumer,tcp", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/disable the SO_REUSEADDR socket option." },
+    "sendBufferSize": { "kind": "parameter", "displayName": "Send Buffer Size", "group": "tcp", "label": "advanced,tcp", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "8192", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SO_SNDBUF option to the specified value (in bytes)" },
+    "tcpNoDelay": { "kind": "parameter", "displayName": "Tcp No Delay", "group": "tcp", "label": "advanced,producer,tcp", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/disable the TCP_NODELAY socket option." },
     "acceptTimeout": { "kind": "parameter", "displayName": "Accept Timeout", "group": "timeout", "label": "advanced,consumer,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "60000", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Timeout (in milliseconds) while waiting for a TCP connection TCP Server Only" },
     "bindRetryInterval": { "kind": "parameter", "displayName": "Bind Retry Interval", "group": "timeout", "label": "advanced,consumer,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "TCP Server Only - The number of milliseconds to wait between bind attempts" },
     "bindTimeout": { "kind": "parameter", "displayName": "Bind Timeout", "group": "timeout", "label": "advanced,consumer,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "30000", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "TCP Server Only - The number of milliseconds to retry binding to a server port" },
-    "keepAlive": { "kind": "parameter", "displayName": "Keep Alive", "group": "tcp", "label": "advanced,producer,tcp", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/disable the SO_KEEPALIVE socket option." },
-    "sendBufferSize": { "kind": "parameter", "displayName": "Send Buffer Size", "group": "tcp", "label": "advanced,tcp", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "8192", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SO_SNDBUF option to the specified value (in bytes)" },
-    "tcpNoDelay": { "kind": "parameter", "displayName": "Tcp No Delay", "group": "tcp", "label": "advanced,producer,tcp", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Enable\/disable the TCP_NODELAY socket option." },
     "connectTimeout": { "kind": "parameter", "displayName": "Connect Timeout", "group": "timeout", "label": "advanced,producer,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "30000", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Timeout (in milliseconds) for establishing for a TCP connection TCP Client only" },
     "idleTimeout": { "kind": "parameter", "displayName": "Idle Timeout", "group": "timeout", "label": "advanced,tcp,timeout", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value less than or equal to [...]
     "maxReceiveTimeouts": { "kind": "parameter", "displayName": "Max Receive Timeouts", "group": "timeout", "label": "advanced,consumer,tcp,timeout", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": true, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The maximum number of timeouts (specified by receiveTimeout) allowed before the TCP Connection will be r [...]
-    "receiveBufferSize": { "kind": "parameter", "displayName": "Receive Buffer Size", "group": "tcp", "label": "advanced,tcp", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "8192", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Sets the SO_RCVBUF option to the specified value (in bytes)" },
     "readTimeout": { "kind": "parameter", "displayName": "Read Timeout", "group": "timeout", "label": "advanced,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "5000", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The SO_TIMEOUT value (in milliseconds) used after the start of an MLLP frame has been received" },
-    "receiveTimeout": { "kind": "parameter", "displayName": "Receive Timeout", "group": "timeout", "label": "advanced,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "15000", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame" },
-    "charsetName": { "kind": "parameter", "displayName": "Charset Name", "group": "codec", "label": "codec", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "Set the CamelCharsetName property on the exchange" }
+    "receiveTimeout": { "kind": "parameter", "displayName": "Receive Timeout", "group": "timeout", "label": "advanced,tcp,timeout", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "15000", "configurationClass": "org.apache.camel.component.mllp.MllpConfiguration", "configurationField": "configuration", "description": "The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame" }
   }
 }
diff --git a/components/camel-mllp/src/main/docs/mllp-component.adoc b/components/camel-mllp/src/main/docs/mllp-component.adoc
index 43032a2..0c018f1 100644
--- a/components/camel-mllp/src/main/docs/mllp-component.adoc
+++ b/components/camel-mllp/src/main/docs/mllp-component.adoc
@@ -106,23 +106,23 @@ with the following path and query parameters:
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used (this component only supports synchronous operations). | true | boolean
+| *charsetName* (codec) | Set the CamelCharsetName property on the exchange |  | String
 | *backlog* (tcp) | The maximum queue length for incoming connection indications (a request to connect) is set to the backlog parameter. If a connection indication arrives when the queue is full, the connection is refused. | 5 | Integer
+| *keepAlive* (tcp) | Enable/disable the SO_KEEPALIVE socket option. | true | Boolean
 | *lenientBind* (tcp) | TCP Server Only - Allow the endpoint to start before the TCP ServerSocket is bound. In some environments, it may be desirable to allow the endpoint to start before the TCP ServerSocket is bound. | false | boolean
 | *maxConcurrentConsumers* (tcp) | The maximum number of concurrent MLLP Consumer connections that will be allowed. If a new connection is received and the maximum is number are already established, the new connection will be reset immediately. | 5 | int
+| *receiveBufferSize* (tcp) | Sets the SO_RCVBUF option to the specified value (in bytes) | 8192 | Integer
 | *reuseAddress* (tcp) | Enable/disable the SO_REUSEADDR socket option. | false | Boolean
+| *sendBufferSize* (tcp) | Sets the SO_SNDBUF option to the specified value (in bytes) | 8192 | Integer
+| *tcpNoDelay* (tcp) | Enable/disable the TCP_NODELAY socket option. | true | Boolean
 | *acceptTimeout* (timeout) | Timeout (in milliseconds) while waiting for a TCP connection TCP Server Only | 60000 | int
 | *bindRetryInterval* (timeout) | TCP Server Only - The number of milliseconds to wait between bind attempts | 5000 | int
 | *bindTimeout* (timeout) | TCP Server Only - The number of milliseconds to retry binding to a server port | 30000 | int
-| *keepAlive* (tcp) | Enable/disable the SO_KEEPALIVE socket option. | true | Boolean
-| *sendBufferSize* (tcp) | Sets the SO_SNDBUF option to the specified value (in bytes) | 8192 | Integer
-| *tcpNoDelay* (tcp) | Enable/disable the TCP_NODELAY socket option. | true | Boolean
 | *connectTimeout* (timeout) | Timeout (in milliseconds) for establishing for a TCP connection TCP Client only | 30000 | int
 | *idleTimeout* (timeout) | The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value less than or equal to zero will disable the idle timeout. |  | Integer
 | *maxReceiveTimeouts* (timeout) | *Deprecated* The maximum number of timeouts (specified by receiveTimeout) allowed before the TCP Connection will be reset. |  | Integer
-| *receiveBufferSize* (tcp) | Sets the SO_RCVBUF option to the specified value (in bytes) | 8192 | Integer
 | *readTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used after the start of an MLLP frame has been received | 5000 | int
 | *receiveTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame | 15000 | int
-| *charsetName* (codec) | Set the CamelCharsetName property on the exchange |  | String
 |===
 // endpoint options: END
 
diff --git a/components/camel-telegram/src/generated/resources/org/apache/camel/component/telegram/telegram.json b/components/camel-telegram/src/generated/resources/org/apache/camel/component/telegram/telegram.json
index 678c370..4a92fc6 100644
--- a/components/camel-telegram/src/generated/resources/org/apache/camel/component/telegram/telegram.json
+++ b/components/camel-telegram/src/generated/resources/org/apache/camel/component/telegram/telegram.json
@@ -43,6 +43,8 @@
     "bufferSize": { "kind": "parameter", "displayName": "Buffer Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "4096", "description": "The initial in-memory buffer size used when transferring data between Camel and AHC Client." },
     "clientConfig": { "kind": "parameter", "displayName": "Client Config", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.asynchttpclient.AsyncHttpClientConfig", "deprecated": false, "secret": false, "description": "To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.telegram.TelegramConfiguration", "configurationField": "configuration", "description": "HTTP proxy host which could be used when sending out the message." },
+    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.telegram.TelegramConfiguration", "configurationField": "configuration", "description": "HTTP proxy port which could be used when sending out the message." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
@@ -57,8 +59,6 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.telegram.TelegramConfiguration", "configurationField": "configuration", "description": "HTTP proxy host which could be used when sending out the message." },
-    "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.telegram.TelegramConfiguration", "configurationField": "configuration", "description": "HTTP proxy port which could be used when sending out the message." },
     "authorizationToken": { "kind": "parameter", "displayName": "Authorization Token", "group": "security", "label": "security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": true, "configurationClass": "org.apache.camel.component.telegram.TelegramConfiguration", "configurationField": "configuration", "description": "The authorization token for using the bot (ask the BotFather)" }
   }
 }
diff --git a/components/camel-telegram/src/main/docs/telegram-component.adoc b/components/camel-telegram/src/main/docs/telegram-component.adoc
index 0e0b9c4..06bdb53 100644
--- a/components/camel-telegram/src/main/docs/telegram-component.adoc
+++ b/components/camel-telegram/src/main/docs/telegram-component.adoc
@@ -109,6 +109,8 @@ with the following path and query parameters:
 | *bufferSize* (advanced) | The initial in-memory buffer size used when transferring data between Camel and AHC Client. | 4096 | int
 | *clientConfig* (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. |  | AsyncHttpClientConfig
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *proxyHost* (proxy) | HTTP proxy host which could be used when sending out the message. |  | String
+| *proxyPort* (proxy) | HTTP proxy port which could be used when sending out the message. |  | Integer
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -123,8 +125,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *proxyHost* (proxy) | HTTP proxy host which could be used when sending out the message. |  | String
-| *proxyPort* (proxy) | HTTP proxy port which could be used when sending out the message. |  | Integer
 | *authorizationToken* (security) | *Required* The authorization token for using the bot (ask the BotFather) |  | String
 |===
 // endpoint options: END
diff --git a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/directmessage/twitter-directmessage.json b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/directmessage/twitter-directmessage.json
index 9d67b45..e3124fb 100644
--- a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/directmessage/twitter-directmessage.json
+++ b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/directmessage/twitter-directmessage.json
@@ -55,6 +55,10 @@
     "numberOfPages": { "kind": "parameter", "displayName": "Number Of Pages", "group": "filter", "label": "consumer,filter", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The number of pages result which you want camel-twitter to consume." },
     "sinceId": { "kind": "parameter", "displayName": "Since Id", "group": "filter", "label": "consumer,filter", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running." },
     "userIds": { "kind": "parameter", "displayName": "User Ids", "group": "filter", "label": "consumer,filter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "To filter by user ids for filter. Multiple values can be separated by comma." },
+    "httpProxyHost": { "kind": "parameter", "displayName": "Http Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
+    "httpProxyPassword": { "kind": "parameter", "displayName": "Http Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
+    "httpProxyPort": { "kind": "parameter", "displayName": "Http Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
+    "httpProxyUser": { "kind": "parameter", "displayName": "Http Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
@@ -69,14 +73,10 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "sortById": { "kind": "parameter", "displayName": "Sort By Id", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "Sorts by id, so the oldest are first, and newest last." },
-    "httpProxyHost": { "kind": "parameter", "displayName": "Http Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
-    "httpProxyPassword": { "kind": "parameter", "displayName": "Http Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
-    "httpProxyPort": { "kind": "parameter", "displayName": "Http Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
-    "httpProxyUser": { "kind": "parameter", "displayName": "Http Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
     "accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The access token. Can also be configured on the TwitterComponent level instead." },
     "accessTokenSecret": { "kind": "parameter", "displayName": "Access Token Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The access secret. Can also be configured on the TwitterComponent level instead." },
     "consumerKey": { "kind": "parameter", "displayName": "Consumer Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The consumer key. Can also be configured on the TwitterComponent level instead." },
-    "consumerSecret": { "kind": "parameter", "displayName": "Consumer Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The consumer secret. Can also be configured on the TwitterComponent level instead." }
+    "consumerSecret": { "kind": "parameter", "displayName": "Consumer Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The consumer secret. Can also be configured on the TwitterComponent level instead." },
+    "sortById": { "kind": "parameter", "displayName": "Sort By Id", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "Sorts by id, so the oldest are first, and newest last." }
   }
 }
diff --git a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/search/twitter-search.json b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/search/twitter-search.json
index 6378650..19eb14a 100644
--- a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/search/twitter-search.json
+++ b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/search/twitter-search.json
@@ -55,6 +55,10 @@
     "numberOfPages": { "kind": "parameter", "displayName": "Number Of Pages", "group": "filter", "label": "consumer,filter", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The number of pages result which you want camel-twitter to consume." },
     "sinceId": { "kind": "parameter", "displayName": "Since Id", "group": "filter", "label": "consumer,filter", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running." },
     "userIds": { "kind": "parameter", "displayName": "User Ids", "group": "filter", "label": "consumer,filter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "To filter by user ids for filter. Multiple values can be separated by comma." },
+    "httpProxyHost": { "kind": "parameter", "displayName": "Http Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
+    "httpProxyPassword": { "kind": "parameter", "displayName": "Http Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
+    "httpProxyPort": { "kind": "parameter", "displayName": "Http Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
+    "httpProxyUser": { "kind": "parameter", "displayName": "Http Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
@@ -69,14 +73,10 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "sortById": { "kind": "parameter", "displayName": "Sort By Id", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "Sorts by id, so the oldest are first, and newest last." },
-    "httpProxyHost": { "kind": "parameter", "displayName": "Http Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
-    "httpProxyPassword": { "kind": "parameter", "displayName": "Http Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
-    "httpProxyPort": { "kind": "parameter", "displayName": "Http Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
-    "httpProxyUser": { "kind": "parameter", "displayName": "Http Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
     "accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The access token. Can also be configured on the TwitterComponent level instead." },
     "accessTokenSecret": { "kind": "parameter", "displayName": "Access Token Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The access secret. Can also be configured on the TwitterComponent level instead." },
     "consumerKey": { "kind": "parameter", "displayName": "Consumer Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The consumer key. Can also be configured on the TwitterComponent level instead." },
-    "consumerSecret": { "kind": "parameter", "displayName": "Consumer Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The consumer secret. Can also be configured on the TwitterComponent level instead." }
+    "consumerSecret": { "kind": "parameter", "displayName": "Consumer Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The consumer secret. Can also be configured on the TwitterComponent level instead." },
+    "sortById": { "kind": "parameter", "displayName": "Sort By Id", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "Sorts by id, so the oldest are first, and newest last." }
   }
 }
diff --git a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/timeline/twitter-timeline.json b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/timeline/twitter-timeline.json
index 25c3ff9..8e423b6 100644
--- a/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/timeline/twitter-timeline.json
+++ b/components/camel-twitter/src/generated/resources/org/apache/camel/component/twitter/timeline/twitter-timeline.json
@@ -56,6 +56,10 @@
     "numberOfPages": { "kind": "parameter", "displayName": "Number Of Pages", "group": "filter", "label": "consumer,filter", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The number of pages result which you want camel-twitter to consume." },
     "sinceId": { "kind": "parameter", "displayName": "Since Id", "group": "filter", "label": "consumer,filter", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "1", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running." },
     "userIds": { "kind": "parameter", "displayName": "User Ids", "group": "filter", "label": "consumer,filter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "To filter by user ids for filter. Multiple values can be separated by comma." },
+    "httpProxyHost": { "kind": "parameter", "displayName": "Http Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
+    "httpProxyPassword": { "kind": "parameter", "displayName": "Http Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
+    "httpProxyPort": { "kind": "parameter", "displayName": "Http Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
+    "httpProxyUser": { "kind": "parameter", "displayName": "Http Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
     "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
     "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
     "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
@@ -70,14 +74,10 @@
     "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
     "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
     "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
-    "sortById": { "kind": "parameter", "displayName": "Sort By Id", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "Sorts by id, so the oldest are first, and newest last." },
-    "httpProxyHost": { "kind": "parameter", "displayName": "Http Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
-    "httpProxyPassword": { "kind": "parameter", "displayName": "Http Proxy Password", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
-    "httpProxyPort": { "kind": "parameter", "displayName": "Http Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
-    "httpProxyUser": { "kind": "parameter", "displayName": "Http Proxy User", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead." },
     "accessToken": { "kind": "parameter", "displayName": "Access Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The access token. Can also be configured on the TwitterComponent level instead." },
     "accessTokenSecret": { "kind": "parameter", "displayName": "Access Token Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The access secret. Can also be configured on the TwitterComponent level instead." },
     "consumerKey": { "kind": "parameter", "displayName": "Consumer Key", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The consumer key. Can also be configured on the TwitterComponent level instead." },
-    "consumerSecret": { "kind": "parameter", "displayName": "Consumer Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The consumer secret. Can also be configured on the TwitterComponent level instead." }
+    "consumerSecret": { "kind": "parameter", "displayName": "Consumer Secret", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "The consumer secret. Can also be configured on the TwitterComponent level instead." },
+    "sortById": { "kind": "parameter", "displayName": "Sort By Id", "group": "sort", "label": "consumer,sort", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.twitter.TwitterConfiguration", "configurationField": "properties", "description": "Sorts by id, so the oldest are first, and newest last." }
   }
 }
diff --git a/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc b/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
index 2aa3c9a..196d000 100644
--- a/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-directmessage-component.adoc
@@ -82,6 +82,10 @@ with the following path and query parameters:
 | *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
 | *sinceId* (filter) | The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running. | 1 | long
 | *userIds* (filter) | To filter by user ids for filter. Multiple values can be separated by comma. |  | String
+| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
+| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -96,15 +100,11 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
-| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
-| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessToken* (security) | The access token. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessTokenSecret* (security) | The access secret. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerKey* (security) | The consumer key. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerSecret* (security) | The consumer secret. Can also be configured on the TwitterComponent level instead. |  | String
+| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/components/camel-twitter/src/main/docs/twitter-search-component.adoc b/components/camel-twitter/src/main/docs/twitter-search-component.adoc
index 5c01aa5..e1c9ec7 100644
--- a/components/camel-twitter/src/main/docs/twitter-search-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-search-component.adoc
@@ -91,6 +91,10 @@ with the following path and query parameters:
 | *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
 | *sinceId* (filter) | The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running. | 1 | long
 | *userIds* (filter) | To filter by user ids for filter. Multiple values can be separated by comma. |  | String
+| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
+| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -105,15 +109,11 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
-| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
-| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessToken* (security) | The access token. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessTokenSecret* (security) | The access secret. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerKey* (security) | The consumer key. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerSecret* (security) | The consumer secret. Can also be configured on the TwitterComponent level instead. |  | String
+| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc b/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
index c410009..241e49c 100644
--- a/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
+++ b/components/camel-twitter/src/main/docs/twitter-timeline-component.adoc
@@ -83,6 +83,10 @@ with the following path and query parameters:
 | *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
 | *sinceId* (filter) | The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running. | 1 | long
 | *userIds* (filter) | To filter by user ids for filter. Multiple values can be separated by comma. |  | String
+| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
+| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -97,15 +101,11 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
-| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
-| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessToken* (security) | The access token. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessTokenSecret* (security) | The access secret. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerKey* (security) | The consumer key. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerSecret* (security) | The consumer secret. Can also be configured on the TwitterComponent level instead. |  | String
+| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/components/camel-undertow/src/generated/resources/org/apache/camel/component/undertow/undertow.json b/components/camel-undertow/src/generated/resources/org/apache/camel/component/undertow/undertow.json
index c60b6df..9548044 100644
--- a/components/camel-undertow/src/generated/resources/org/apache/camel/component/undertow/undertow.json
+++ b/components/camel-undertow/src/generated/resources/org/apache/camel/component/undertow/undertow.json
@@ -55,9 +55,9 @@
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
     "undertowHttpBinding": { "kind": "parameter", "displayName": "Undertow Http Binding", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.undertow.UndertowHttpBinding", "deprecated": false, "secret": false, "description": "To use a custom UndertowHttpBinding to control the mapping between Camel message and undertow." },
+    "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters" },
     "fireWebSocketChannelEvents": { "kind": "parameter", "displayName": "Fire Web Socket Channel Events", "group": "websocket", "label": "consumer,websocket", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "if true, the consumer will post notifications to the route when a new WebSocket peer connects, disconnects, etc. See UndertowConstants.EVENT_TYPE and EventType." },
     "sendTimeout": { "kind": "parameter", "displayName": "Send Timeout", "group": "websocket", "label": "producer,websocket", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "30000", "description": "Timeout in milliseconds when sending to a websocket channel. The default timeout is 30000 (30 seconds)." },
-    "sendToAll": { "kind": "parameter", "displayName": "Send To All", "group": "websocket", "label": "producer,websocket", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the UndertowConstants.SEND_TO_ALL header on the message." },
-    "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "To configure security using SSLContextParameters" }
+    "sendToAll": { "kind": "parameter", "displayName": "Send To All", "group": "websocket", "label": "producer,websocket", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the UndertowConstants.SEND_TO_ALL header on the message." }
   }
 }
diff --git a/components/camel-undertow/src/main/docs/undertow-component.adoc b/components/camel-undertow/src/main/docs/undertow-component.adoc
index 7c723a0..4969d8d 100644
--- a/components/camel-undertow/src/main/docs/undertow-component.adoc
+++ b/components/camel-undertow/src/main/docs/undertow-component.adoc
@@ -115,10 +115,10 @@ with the following path and query parameters:
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *undertowHttpBinding* (advanced) | To use a custom UndertowHttpBinding to control the mapping between Camel message and undertow. |  | UndertowHttpBinding
+| *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 | *fireWebSocketChannelEvents* (websocket) | if true, the consumer will post notifications to the route when a new WebSocket peer connects, disconnects, etc. See UndertowConstants.EVENT_TYPE and EventType. | false | boolean
 | *sendTimeout* (websocket) | Timeout in milliseconds when sending to a websocket channel. The default timeout is 30000 (30 seconds). | 30000 | Integer
 | *sendToAll* (websocket) | To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the UndertowConstants.SEND_TO_ALL header on the message. |  | Boolean
-| *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
 // endpoint options: END
 
diff --git a/components/camel-weather/src/generated/resources/org/apache/camel/component/weather/weather.json b/components/camel-weather/src/generated/resources/org/apache/camel/component/weather/weather.json
index 680e234..b189e24 100644
--- a/components/camel-weather/src/generated/resources/org/apache/camel/component/weather/weather.json
+++ b/components/camel-weather/src/generated/resources/org/apache/camel/component/weather/weather.json
@@ -43,20 +43,6 @@
     "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "httpConnectionManager": { "kind": "parameter", "displayName": "Http Connection Manager", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.commons.httpclient.HttpConnectionManager", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.weather.WeatherConfiguration", "configurationField": "configuration", "description": "To use a custom HttpConnectionManager to manage connections" },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
-    "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
-    "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
-    "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
-    "delay": { "kind": "parameter", "displayName": "Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "500", "description": "Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour)." },
-    "greedy": { "kind": "parameter", "displayName": "Greedy", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." },
-    "initialDelay": { "kind": "parameter", "displayName": "Initial Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "1000", "description": "Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour)." },
-    "repeatCount": { "kind": "parameter", "displayName": "Repeat Count", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "0", "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." },
-    "runLoggingLevel": { "kind": "parameter", "displayName": "Run Logging Level", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "secret": false, "defaultValue": "TRACE", "description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the logging level for that." },
-    "scheduledExecutorService": { "kind": "parameter", "displayName": "Scheduled Executor Service", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "secret": false, "description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." },
-    "scheduler": { "kind": "parameter", "displayName": "Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "none", "spring", "quartz" ], "deprecated": false, "secret": false, "defaultValue": "none", "description": "To use a cron scheduler from either camel-spring or camel-quartz component" },
-    "schedulerProperties": { "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." },
-    "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
-    "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
-    "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
     "cnt": { "kind": "parameter", "displayName": "Cnt", "group": "filter", "label": "filter", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.weather.WeatherConfiguration", "configurationField": "configuration", "description": "Number of results to be found" },
     "ids": { "kind": "parameter", "displayName": "Ids", "group": "filter", "label": "filter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.weather.WeatherConfiguration", "configurationField": "configuration", "description": "List of id's of city\/stations. You can separate multiple ids by comma." },
     "lat": { "kind": "parameter", "displayName": "Lat", "group": "filter", "label": "filter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.weather.WeatherConfiguration", "configurationField": "configuration", "description": "Latitude of location. You can use lat and lon options instead of location. For boxed queries this is the bottom latitude." },
@@ -73,6 +59,20 @@
     "proxyAuthUsername": { "kind": "parameter", "displayName": "Proxy Auth Username", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.weather.WeatherConfiguration", "configurationField": "configuration", "description": "Username for proxy authentication" },
     "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "proxy", "label": "proxy", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.weather.WeatherConfiguration", "configurationField": "configuration", "description": "The proxy host name" },
     "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "proxy", "label": "proxy", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.weather.WeatherConfiguration", "configurationField": "configuration", "description": "The proxy port number" },
+    "backoffErrorThreshold": { "kind": "parameter", "displayName": "Backoff Error Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in." },
+    "backoffIdleThreshold": { "kind": "parameter", "displayName": "Backoff Idle Threshold", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in." },
+    "backoffMultiplier": { "kind": "parameter", "displayName": "Backoff Multiplier", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "To let the scheduled polling consumer backoff if there has been a number of subsequent idles\/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option  [...]
+    "delay": { "kind": "parameter", "displayName": "Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "500", "description": "Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour)." },
+    "greedy": { "kind": "parameter", "displayName": "Greedy", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages." },
+    "initialDelay": { "kind": "parameter", "displayName": "Initial Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "1000", "description": "Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour)." },
+    "repeatCount": { "kind": "parameter", "displayName": "Repeat Count", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "0", "description": "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever." },
+    "runLoggingLevel": { "kind": "parameter", "displayName": "Run Logging Level", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "org.apache.camel.LoggingLevel", "enum": [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ], "deprecated": false, "secret": false, "defaultValue": "TRACE", "description": "The consumer logs a start\/complete log line when it polls. This option allows you to configure the logging level for that." },
+    "scheduledExecutorService": { "kind": "parameter", "displayName": "Scheduled Executor Service", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.ScheduledExecutorService", "deprecated": false, "secret": false, "description": "Allows for configuring a custom\/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool." },
+    "scheduler": { "kind": "parameter", "displayName": "Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "none", "spring", "quartz" ], "deprecated": false, "secret": false, "defaultValue": "none", "description": "To use a cron scheduler from either camel-spring or camel-quartz component" },
+    "schedulerProperties": { "kind": "parameter", "displayName": "Scheduler Properties", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "scheduler.", "multiValue": true, "deprecated": false, "secret": false, "description": "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler." },
+    "startScheduler": { "kind": "parameter", "displayName": "Start Scheduler", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Whether the scheduler should be auto started." },
+    "timeUnit": { "kind": "parameter", "displayName": "Time Unit", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "object", "javaType": "java.util.concurrent.TimeUnit", "enum": [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ], "deprecated": false, "secret": false, "defaultValue": "MILLISECONDS", "description": "Time unit for initialDelay and delay options." },
+    "useFixedDelay": { "kind": "parameter", "displayName": "Use Fixed Delay", "group": "scheduler", "label": "consumer,scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "true", "description": "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details." },
     "geolocationAccessKey": { "kind": "parameter", "displayName": "Geolocation Access Key", "group": "security", "label": "security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.weather.WeatherConfiguration", "configurationField": "configuration", "description": "The geolocation service now needs an accessKey to be used" },
     "geolocationRequestHostIP": { "kind": "parameter", "displayName": "Geolocation Request Host IP", "group": "security", "label": "security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.weather.WeatherConfiguration", "configurationField": "configuration", "description": "The geolocation service now needs to specify the IP associated to the accessKey you' [...]
   }
diff --git a/components/camel-weather/src/main/docs/weather-component.adoc b/components/camel-weather/src/main/docs/weather-component.adoc
index 9c68c32..76f6002 100644
--- a/components/camel-weather/src/main/docs/weather-component.adoc
+++ b/components/camel-weather/src/main/docs/weather-component.adoc
@@ -110,20 +110,6 @@ with the following path and query parameters:
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpConnectionManager* (advanced) | To use a custom HttpConnectionManager to manage connections |  | HttpConnectionManager
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
-| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
-| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
-| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
-| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
-| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
-| *repeatCount* (scheduler) | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0 | long
-| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | TRACE | LoggingLevel
-| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutorService
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component. The value can be one of: none, spring, quartz | none | String
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
-| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
-| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
-| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *cnt* (filter) | Number of results to be found |  | Integer
 | *ids* (filter) | List of id's of city/stations. You can separate multiple ids by comma. |  | String
 | *lat* (filter) | Latitude of location. You can use lat and lon options instead of location. For boxed queries this is the bottom latitude. |  | String
@@ -140,6 +126,20 @@ with the following path and query parameters:
 | *proxyAuthUsername* (proxy) | Username for proxy authentication |  | String
 | *proxyHost* (proxy) | The proxy host name |  | String
 | *proxyPort* (proxy) | The proxy port number |  | Integer
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *repeatCount* (scheduler) | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutorService
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component. The value can be one of: none, spring, quartz | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *geolocationAccessKey* (security) | *Required* The geolocation service now needs an accessKey to be used |  | String
 | *geolocationRequestHostIP* (security) | *Required* The geolocation service now needs to specify the IP associated to the accessKey you're using |  | String
 |===
diff --git a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json
index bad2375..a61e320 100644
--- a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json
+++ b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json
@@ -25,12 +25,12 @@
     "disallowDoctypeDecl": { "kind": "property", "displayName": "Disallow Doctype Decl", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declarat [...]
     "keySelector": { "kind": "property", "displayName": "Key Selector", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.xml.crypto.KeySelector", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Provides the key for validating the XML signature." },
     "omitXmlDeclaration": { "kind": "property", "displayName": "Omit Xml Declaration", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Indicator whether the XML declaration in the outgoing message body shou [...]
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
     "outputNodeSearch": { "kind": "property", "displayName": "Output Node Search", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Sets the output node search value for determining the node from the XML signature document which shall be  [...]
     "outputNodeSearchType": { "kind": "property", "displayName": "Output Node Search Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Default", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Determines the search type for determining the output node which is se [...]
     "outputXmlEncoding": { "kind": "property", "displayName": "Output Xml Encoding", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the origin [...]
     "removeSignatureElements": { "kind": "property", "displayName": "Remove Signature Elements", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Indicator whether the XML signature elements (elements with local [...]
     "schemaResourceUri": { "kind": "property", "displayName": "Schema Resource Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining th [...]
+    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
     "secureValidation": { "kind": "property", "displayName": "Secure Validation", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Enables secure validation. If true then secure validation is enabled." },
     "validationFailedHandler": { "kind": "property", "displayName": "Validation Failed Handler", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Handles the different validation failed si [...]
     "xmlSignature2Message": { "kind": "property", "displayName": "Xml Signature2 Message", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.XmlSignature2Message", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Bean which maps the XML signature to the output-mes [...]
diff --git a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-verify-component.adoc b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-verify-component.adoc
index d6e9dcf..08d09fb 100644
--- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-verify-component.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-verify-component.adoc
@@ -246,12 +246,12 @@ The XML Security Verify component supports 19 options, which are listed below.
 | *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keySelector* (producer) | Provides the key for validating the XML signature. |  | KeySelector
 | *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
-| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *outputNodeSearch* (producer) | Sets the output node search value for determining the node from the XML signature document which shall be set to the output message body. The class of the value depends on the type of the output node search. The output node search is forwarded to XmlSignature2Message. |  | Object
 | *outputNodeSearchType* (producer) | Determines the search type for determining the output node which is serialized into the output message bodyF. See setOutputNodeSearch(Object). The supported default search types you can find in DefaultXmlSignature2Message. | Default | String
 | *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *removeSignatureElements* (producer) | Indicator whether the XML signature elements (elements with local name Signature and namesapce \http://www.w3.org/2000/09/xmldsig#) shall be removed from the document set to the output message. Normally, this is only necessary, if the XML signature is enveloped. The default value is Boolean#FALSE. This parameter is forwarded to XmlSignature2Message. This indicator has no effect if the output node search is of type DefaultXmlSignature2Message#OUTPU [...]
 | *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
+| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *secureValidation* (producer) | Enables secure validation. If true then secure validation is enabled. | true | Boolean
 | *validationFailedHandler* (producer) | Handles the different validation failed situations. The default implementation throws specific exceptions for the different situations (All exceptions have the package name org.apache.camel.component.xmlsecurity.api and are a sub-class of XmlSignatureInvalidException. If the signature value validation fails, a XmlSignatureInvalidValueException is thrown. If a reference validation fails, a XmlSignatureInvalidContentHashException is thrown. For more [...]
 | *xmlSignature2Message* (producer) | Bean which maps the XML signature to the output-message after the validation. How this mapping should be done can be configured by the options outputNodeSearchType, outputNodeSearch, and removeSignatureElements. The default implementation offers three possibilities which are related to the three output node search types Default, ElementName, and XPath. The default implementation determines a node which is then serialized and set to the body of the ou [...]
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 2bbafbb..4b786fb 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -1601,7 +1601,8 @@ public interface ComponentsBuilderFactory {
     }
     /**
      * Google Pubsub (camel-google-pubsub)
-     * Messaging client for Google Cloud Platform PubSub Service
+     * Messaging client for Google Cloud Platform PubSub Service Built on top of
+     * the Google Cloud Pub/Sub libraries.
      * 
      * Category: messaging
      * Since: 2.19
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
index f8c5c64..0a11692 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ActivemqComponentBuilderFactory.java
@@ -1505,6 +1505,20 @@ public interface ActivemqComponentBuilderFactory {
             return this;
         }
         /**
+         * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
+         * header to and from Camel message.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
+         * 
+         * Group: filter
+         */
+        default ActivemqComponentBuilder headerFilterStrategy(
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
+            doSetProperty("headerFilterStrategy", headerFilterStrategy);
+            return this;
+        }
+        /**
          * Allows to configure the default errorHandler logging level for
          * logging uncaught exceptions.
          * 
@@ -1533,20 +1547,6 @@ public interface ActivemqComponentBuilderFactory {
             return this;
         }
         /**
-         * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
-         * header to and from Camel message.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
-         * 
-         * Group: filter
-         */
-        default ActivemqComponentBuilder headerFilterStrategy(
-                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
-            doSetProperty("headerFilterStrategy", headerFilterStrategy);
-            return this;
-        }
-        /**
          * Password to use with the ConnectionFactory. You can also configure
          * username/password directly on the ConnectionFactory.
          * 
@@ -1748,9 +1748,9 @@ public interface ActivemqComponentBuilderFactory {
             case "useMessageIDAsCorrelationID": getOrCreateConfiguration((ActiveMQComponent) component).setUseMessageIDAsCorrelationID((boolean) value); return true;
             case "waitForProvisionCorrelationToBeUpdatedCounter": getOrCreateConfiguration((ActiveMQComponent) component).setWaitForProvisionCorrelationToBeUpdatedCounter((int) value); return true;
             case "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": getOrCreateConfiguration((ActiveMQComponent) component).setWaitForProvisionCorrelationToBeUpdatedThreadSleepingTime((long) value); return true;
+            case "headerFilterStrategy": ((ActiveMQComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
             case "errorHandlerLoggingLevel": getOrCreateConfiguration((ActiveMQComponent) component).setErrorHandlerLoggingLevel((org.apache.camel.LoggingLevel) value); return true;
             case "errorHandlerLogStackTrace": getOrCreateConfiguration((ActiveMQComponent) component).setErrorHandlerLogStackTrace((boolean) value); return true;
-            case "headerFilterStrategy": ((ActiveMQComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
             case "password": getOrCreateConfiguration((ActiveMQComponent) component).setPassword((java.lang.String) value); return true;
             case "username": getOrCreateConfiguration((ActiveMQComponent) component).setUsername((java.lang.String) value); return true;
             case "transacted": getOrCreateConfiguration((ActiveMQComponent) component).setTransacted((boolean) value); return true;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
index 197c80d..6610e2d 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AmqpComponentBuilderFactory.java
@@ -1443,6 +1443,20 @@ public interface AmqpComponentBuilderFactory {
             return this;
         }
         /**
+         * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
+         * header to and from Camel message.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
+         * 
+         * Group: filter
+         */
+        default AmqpComponentBuilder headerFilterStrategy(
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
+            doSetProperty("headerFilterStrategy", headerFilterStrategy);
+            return this;
+        }
+        /**
          * Allows to configure the default errorHandler logging level for
          * logging uncaught exceptions.
          * 
@@ -1471,20 +1485,6 @@ public interface AmqpComponentBuilderFactory {
             return this;
         }
         /**
-         * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
-         * header to and from Camel message.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
-         * 
-         * Group: filter
-         */
-        default AmqpComponentBuilder headerFilterStrategy(
-                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
-            doSetProperty("headerFilterStrategy", headerFilterStrategy);
-            return this;
-        }
-        /**
          * Password to use with the ConnectionFactory. You can also configure
          * username/password directly on the ConnectionFactory.
          * 
@@ -1682,9 +1682,9 @@ public interface AmqpComponentBuilderFactory {
             case "useMessageIDAsCorrelationID": getOrCreateConfiguration((AMQPComponent) component).setUseMessageIDAsCorrelationID((boolean) value); return true;
             case "waitForProvisionCorrelationToBeUpdatedCounter": getOrCreateConfiguration((AMQPComponent) component).setWaitForProvisionCorrelationToBeUpdatedCounter((int) value); return true;
             case "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": getOrCreateConfiguration((AMQPComponent) component).setWaitForProvisionCorrelationToBeUpdatedThreadSleepingTime((long) value); return true;
+            case "headerFilterStrategy": ((AMQPComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
             case "errorHandlerLoggingLevel": getOrCreateConfiguration((AMQPComponent) component).setErrorHandlerLoggingLevel((org.apache.camel.LoggingLevel) value); return true;
             case "errorHandlerLogStackTrace": getOrCreateConfiguration((AMQPComponent) component).setErrorHandlerLogStackTrace((boolean) value); return true;
-            case "headerFilterStrategy": ((AMQPComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
             case "password": getOrCreateConfiguration((AMQPComponent) component).setPassword((java.lang.String) value); return true;
             case "username": getOrCreateConfiguration((AMQPComponent) component).setUsername((java.lang.String) value); return true;
             case "transacted": getOrCreateConfiguration((AMQPComponent) component).setTransacted((boolean) value); return true;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsS3ComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsS3ComponentBuilderFactory.java
index 7315127..d91aab3 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsS3ComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsS3ComponentBuilderFactory.java
@@ -442,20 +442,6 @@ public interface AwsS3ComponentBuilderFactory {
             return this;
         }
         /**
-         * Whether the component should use basic property binding (Camel 2.x)
-         * or the newer property binding with additional capabilities.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AwsS3ComponentBuilder basicPropertyBinding(
-                boolean basicPropertyBinding) {
-            doSetProperty("basicPropertyBinding", basicPropertyBinding);
-            return this;
-        }
-        /**
          * Define if Accelerate Mode enabled is true or false.
          * 
          * The option is a: <code>boolean</code> type.
@@ -520,6 +506,20 @@ public interface AwsS3ComponentBuilderFactory {
             return this;
         }
         /**
+         * Whether the component should use basic property binding (Camel 2.x)
+         * or the newer property binding with additional capabilities.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AwsS3ComponentBuilder basicPropertyBinding(
+                boolean basicPropertyBinding) {
+            doSetProperty("basicPropertyBinding", basicPropertyBinding);
+            return this;
+        }
+        /**
          * Amazon AWS Access Key.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -594,12 +594,12 @@ public interface AwsS3ComponentBuilderFactory {
             case "storageClass": getOrCreateConfiguration((S3Component) component).setStorageClass((java.lang.String) value); return true;
             case "awsKMSKeyId": getOrCreateConfiguration((S3Component) component).setAwsKMSKeyId((java.lang.String) value); return true;
             case "useAwsKMS": getOrCreateConfiguration((S3Component) component).setUseAwsKMS((boolean) value); return true;
-            case "basicPropertyBinding": ((S3Component) component).setBasicPropertyBinding((boolean) value); return true;
             case "accelerateModeEnabled": getOrCreateConfiguration((S3Component) component).setAccelerateModeEnabled((boolean) value); return true;
             case "chunkedEncodingDisabled": getOrCreateConfiguration((S3Component) component).setChunkedEncodingDisabled((boolean) value); return true;
             case "dualstackEnabled": getOrCreateConfiguration((S3Component) component).setDualstackEnabled((boolean) value); return true;
             case "forceGlobalBucketAccessEnabled": getOrCreateConfiguration((S3Component) component).setForceGlobalBucketAccessEnabled((boolean) value); return true;
             case "payloadSigningEnabled": getOrCreateConfiguration((S3Component) component).setPayloadSigningEnabled((boolean) value); return true;
+            case "basicPropertyBinding": ((S3Component) component).setBasicPropertyBinding((boolean) value); return true;
             case "accessKey": getOrCreateConfiguration((S3Component) component).setAccessKey((java.lang.String) value); return true;
             case "secretKey": getOrCreateConfiguration((S3Component) component).setSecretKey((java.lang.String) value); return true;
             default: return false;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSwfComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSwfComponentBuilderFactory.java
index 472d485..eadd6e1 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSwfComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/AwsSwfComponentBuilderFactory.java
@@ -178,6 +178,70 @@ public interface AwsSwfComponentBuilderFactory {
             return this;
         }
         /**
+         * The list name to consume activities from.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: activity
+         */
+        default AwsSwfComponentBuilder activityList(
+                java.lang.String activityList) {
+            doSetProperty("activityList", activityList);
+            return this;
+        }
+        /**
+         * Activity scheduling options.
+         * 
+         * The option is a:
+         * <code>com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions</code> type.
+         * 
+         * Group: activity
+         */
+        default AwsSwfComponentBuilder activitySchedulingOptions(
+                com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions activitySchedulingOptions) {
+            doSetProperty("activitySchedulingOptions", activitySchedulingOptions);
+            return this;
+        }
+        /**
+         * Maximum number of threads in work pool for activity.
+         * 
+         * The option is a: <code>int</code> type.
+         * 
+         * Default: 100
+         * Group: activity
+         */
+        default AwsSwfComponentBuilder activityThreadPoolSize(
+                int activityThreadPoolSize) {
+            doSetProperty("activityThreadPoolSize", activityThreadPoolSize);
+            return this;
+        }
+        /**
+         * Activity execution options.
+         * 
+         * The option is a:
+         * <code>com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions</code> type.
+         * 
+         * Group: activity
+         */
+        default AwsSwfComponentBuilder activityTypeExecutionOptions(
+                com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions activityTypeExecutionOptions) {
+            doSetProperty("activityTypeExecutionOptions", activityTypeExecutionOptions);
+            return this;
+        }
+        /**
+         * Activity registration options.
+         * 
+         * The option is a:
+         * <code>com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions</code> type.
+         * 
+         * Group: activity
+         */
+        default AwsSwfComponentBuilder activityTypeRegistrationOptions(
+                com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions activityTypeRegistrationOptions) {
+            doSetProperty("activityTypeRegistrationOptions", activityTypeRegistrationOptions);
+            return this;
+        }
+        /**
          * Whether the component should use basic property binding (Camel 2.x)
          * or the newer property binding with additional capabilities.
          * 
@@ -234,67 +298,25 @@ public interface AwsSwfComponentBuilderFactory {
             return this;
         }
         /**
-         * The list name to consume activities from.
+         * Amazon AWS Access Key.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: activity
-         */
-        default AwsSwfComponentBuilder activityList(
-                java.lang.String activityList) {
-            doSetProperty("activityList", activityList);
-            return this;
-        }
-        /**
-         * Activity scheduling options.
-         * 
-         * The option is a:
-         * <code>com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions</code> type.
-         * 
-         * Group: activity
-         */
-        default AwsSwfComponentBuilder activitySchedulingOptions(
-                com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions activitySchedulingOptions) {
-            doSetProperty("activitySchedulingOptions", activitySchedulingOptions);
-            return this;
-        }
-        /**
-         * Maximum number of threads in work pool for activity.
-         * 
-         * The option is a: <code>int</code> type.
-         * 
-         * Default: 100
-         * Group: activity
-         */
-        default AwsSwfComponentBuilder activityThreadPoolSize(
-                int activityThreadPoolSize) {
-            doSetProperty("activityThreadPoolSize", activityThreadPoolSize);
-            return this;
-        }
-        /**
-         * Activity execution options.
-         * 
-         * The option is a:
-         * <code>com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions</code> type.
-         * 
-         * Group: activity
+         * Group: security
          */
-        default AwsSwfComponentBuilder activityTypeExecutionOptions(
-                com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions activityTypeExecutionOptions) {
-            doSetProperty("activityTypeExecutionOptions", activityTypeExecutionOptions);
+        default AwsSwfComponentBuilder accessKey(java.lang.String accessKey) {
+            doSetProperty("accessKey", accessKey);
             return this;
         }
         /**
-         * Activity registration options.
+         * Amazon AWS Secret Key.
          * 
-         * The option is a:
-         * <code>com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: activity
+         * Group: security
          */
-        default AwsSwfComponentBuilder activityTypeRegistrationOptions(
-                com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions activityTypeRegistrationOptions) {
-            doSetProperty("activityTypeRegistrationOptions", activityTypeRegistrationOptions);
+        default AwsSwfComponentBuilder secretKey(java.lang.String secretKey) {
+            doSetProperty("secretKey", secretKey);
             return this;
         }
         /**
@@ -418,28 +440,6 @@ public interface AwsSwfComponentBuilderFactory {
             doSetProperty("workflowTypeRegistrationOptions", workflowTypeRegistrationOptions);
             return this;
         }
-        /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default AwsSwfComponentBuilder accessKey(java.lang.String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
-         * Amazon AWS Secret Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default AwsSwfComponentBuilder secretKey(java.lang.String secretKey) {
-            doSetProperty("secretKey", secretKey);
-            return this;
-        }
     }
 
     class AwsSwfComponentBuilderImpl
@@ -473,15 +473,17 @@ public interface AwsSwfComponentBuilderFactory {
             case "version": getOrCreateConfiguration((SWFComponent) component).setVersion((java.lang.String) value); return true;
             case "bridgeErrorHandler": ((SWFComponent) component).setBridgeErrorHandler((boolean) value); return true;
             case "lazyStartProducer": ((SWFComponent) component).setLazyStartProducer((boolean) value); return true;
-            case "basicPropertyBinding": ((SWFComponent) component).setBasicPropertyBinding((boolean) value); return true;
-            case "clientConfigurationParameters": getOrCreateConfiguration((SWFComponent) component).setClientConfigurationParameters((java.util.Map) value); return true;
-            case "startWorkflowOptionsParameters": getOrCreateConfiguration((SWFComponent) component).setStartWorkflowOptionsParameters((java.util.Map) value); return true;
-            case "sWClientParameters": getOrCreateConfiguration((SWFComponent) component).setSWClientParameters((java.util.Map) value); return true;
             case "activityList": getOrCreateConfiguration((SWFComponent) component).setActivityList((java.lang.String) value); return true;
             case "activitySchedulingOptions": getOrCreateConfiguration((SWFComponent) component).setActivitySchedulingOptions((com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions) value); return true;
             case "activityThreadPoolSize": getOrCreateConfiguration((SWFComponent) component).setActivityThreadPoolSize((int) value); return true;
             case "activityTypeExecutionOptions": getOrCreateConfiguration((SWFComponent) component).setActivityTypeExecutionOptions((com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions) value); return true;
             case "activityTypeRegistrationOptions": getOrCreateConfiguration((SWFComponent) component).setActivityTypeRegistrationOptions((com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions) value); return true;
+            case "basicPropertyBinding": ((SWFComponent) component).setBasicPropertyBinding((boolean) value); return true;
+            case "clientConfigurationParameters": getOrCreateConfiguration((SWFComponent) component).setClientConfigurationParameters((java.util.Map) value); return true;
+            case "startWorkflowOptionsParameters": getOrCreateConfiguration((SWFComponent) component).setStartWorkflowOptionsParameters((java.util.Map) value); return true;
+            case "sWClientParameters": getOrCreateConfiguration((SWFComponent) component).setSWClientParameters((java.util.Map) value); return true;
+            case "accessKey": getOrCreateConfiguration((SWFComponent) component).setAccessKey((java.lang.String) value); return true;
+            case "secretKey": getOrCreateConfiguration((SWFComponent) component).setSecretKey((java.lang.String) value); return true;
             case "childPolicy": getOrCreateConfiguration((SWFComponent) component).setChildPolicy((java.lang.String) value); return true;
             case "executionStartToCloseTimeout": getOrCreateConfiguration((SWFComponent) component).setExecutionStartToCloseTimeout((java.lang.String) value); return true;
             case "operation": getOrCreateConfiguration((SWFComponent) component).setOperation((java.lang.String) value); return true;
@@ -492,8 +494,6 @@ public interface AwsSwfComponentBuilderFactory {
             case "terminationReason": getOrCreateConfiguration((SWFComponent) component).setTerminationReason((java.lang.String) value); return true;
             case "workflowList": getOrCreateConfiguration((SWFComponent) component).setWorkflowList((java.lang.String) value); return true;
             case "workflowTypeRegistrationOptions": getOrCreateConfiguration((SWFComponent) component).setWorkflowTypeRegistrationOptions((com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions) value); return true;
-            case "accessKey": getOrCreateConfiguration((SWFComponent) component).setAccessKey((java.lang.String) value); return true;
-            case "secretKey": getOrCreateConfiguration((SWFComponent) component).setSecretKey((java.lang.String) value); return true;
             default: return false;
             }
         }
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
index bfa311d..e93ae2b 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/BoxComponentBuilderFactory.java
@@ -161,6 +161,21 @@ public interface BoxComponentBuilderFactory {
             return this;
         }
         /**
+         * The type of authentication for connection. Types of Authentication:
+         * STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION
+         * - OAuth 2.0 with JSON Web Tokens.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Default: APP_USER_AUTHENTICATION
+         * Group: authentication
+         */
+        default BoxComponentBuilder authenticationType(
+                java.lang.String authenticationType) {
+            doSetProperty("authenticationType", authenticationType);
+            return this;
+        }
+        /**
          * Custom Access Token Cache for storing and retrieving access tokens.
          * 
          * The option is a: <code>com.box.sdk.IAccessTokenCache</code> type.
@@ -210,21 +225,6 @@ public interface BoxComponentBuilderFactory {
             return this;
         }
         /**
-         * The type of authentication for connection. Types of Authentication:
-         * STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION
-         * - OAuth 2.0 with JSON Web Tokens.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: APP_USER_AUTHENTICATION
-         * Group: authentication
-         */
-        default BoxComponentBuilder authenticationType(
-                java.lang.String authenticationType) {
-            doSetProperty("authenticationType", authenticationType);
-            return this;
-        }
-        /**
          * The private key for generating the JWT signature.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -327,11 +327,11 @@ public interface BoxComponentBuilderFactory {
             case "lazyStartProducer": ((BoxComponent) component).setLazyStartProducer((boolean) value); return true;
             case "basicPropertyBinding": ((BoxComponent) component).setBasicPropertyBinding((boolean) value); return true;
             case "httpParams": getOrCreateConfiguration((BoxComponent) component).setHttpParams((java.util.Map) value); return true;
+            case "authenticationType": getOrCreateConfiguration((BoxComponent) component).setAuthenticationType((java.lang.String) value); return true;
             case "accessTokenCache": getOrCreateConfiguration((BoxComponent) component).setAccessTokenCache((com.box.sdk.IAccessTokenCache) value); return true;
             case "clientSecret": getOrCreateConfiguration((BoxComponent) component).setClientSecret((java.lang.String) value); return true;
             case "encryptionAlgorithm": getOrCreateConfiguration((BoxComponent) component).setEncryptionAlgorithm((com.box.sdk.EncryptionAlgorithm) value); return true;
             case "maxCacheEntries": getOrCreateConfiguration((BoxComponent) component).setMaxCacheEntries((int) value); return true;
-            case "authenticationType": getOrCreateConfiguration((BoxComponent) component).setAuthenticationType((java.lang.String) value); return true;
             case "privateKeyFile": getOrCreateConfiguration((BoxComponent) component).setPrivateKeyFile((java.lang.String) value); return true;
             case "privateKeyPassword": getOrCreateConfiguration((BoxComponent) component).setPrivateKeyPassword((java.lang.String) value); return true;
             case "publicKeyId": getOrCreateConfiguration((BoxComponent) component).setPublicKeyId((java.lang.String) value); return true;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
index d3bb59e..7f225e8 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/ConsulComponentBuilderFactory.java
@@ -288,44 +288,6 @@ public interface ConsulComponentBuilderFactory {
             return this;
         }
         /**
-         * The second to wait for a watch event, default 10 seconds.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Default: 10
-         * Group: watch
-         */
-        default ConsulComponentBuilder blockSeconds(
-                java.lang.Integer blockSeconds) {
-            doSetProperty("blockSeconds", blockSeconds);
-            return this;
-        }
-        /**
-         * The first index for watch for, default 0.
-         * 
-         * The option is a: <code>java.math.BigInteger</code> type.
-         * 
-         * Default: 0
-         * Group: watch
-         */
-        default ConsulComponentBuilder firstIndex(
-                java.math.BigInteger firstIndex) {
-            doSetProperty("firstIndex", firstIndex);
-            return this;
-        }
-        /**
-         * Recursively watch, default false.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: watch
-         */
-        default ConsulComponentBuilder recursive(boolean recursive) {
-            doSetProperty("recursive", recursive);
-            return this;
-        }
-        /**
          * Sets the ACL token to be used with Consul.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -385,6 +347,44 @@ public interface ConsulComponentBuilderFactory {
             doSetProperty("userName", userName);
             return this;
         }
+        /**
+         * The second to wait for a watch event, default 10 seconds.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Default: 10
+         * Group: watch
+         */
+        default ConsulComponentBuilder blockSeconds(
+                java.lang.Integer blockSeconds) {
+            doSetProperty("blockSeconds", blockSeconds);
+            return this;
+        }
+        /**
+         * The first index for watch for, default 0.
+         * 
+         * The option is a: <code>java.math.BigInteger</code> type.
+         * 
+         * Default: 0
+         * Group: watch
+         */
+        default ConsulComponentBuilder firstIndex(
+                java.math.BigInteger firstIndex) {
+            doSetProperty("firstIndex", firstIndex);
+            return this;
+        }
+        /**
+         * Recursively watch, default false.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: watch
+         */
+        default ConsulComponentBuilder recursive(boolean recursive) {
+            doSetProperty("recursive", recursive);
+            return this;
+        }
     }
 
     class ConsulComponentBuilderImpl
@@ -427,14 +427,14 @@ public interface ConsulComponentBuilderFactory {
             case "datacenter": getOrCreateConfiguration((ConsulComponent) component).setDatacenter((java.lang.String) value); return true;
             case "nearNode": getOrCreateConfiguration((ConsulComponent) component).setNearNode((java.lang.String) value); return true;
             case "nodeMeta": getOrCreateConfiguration((ConsulComponent) component).setNodeMeta((java.util.List) value); return true;
-            case "blockSeconds": getOrCreateConfiguration((ConsulComponent) component).setBlockSeconds((java.lang.Integer) value); return true;
-            case "firstIndex": getOrCreateConfiguration((ConsulComponent) component).setFirstIndex((java.math.BigInteger) value); return true;
-            case "recursive": getOrCreateConfiguration((ConsulComponent) component).setRecursive((boolean) value); return true;
             case "aclToken": getOrCreateConfiguration((ConsulComponent) component).setAclToken((java.lang.String) value); return true;
             case "password": getOrCreateConfiguration((ConsulComponent) component).setPassword((java.lang.String) value); return true;
             case "sslContextParameters": getOrCreateConfiguration((ConsulComponent) component).setSslContextParameters((org.apache.camel.support.jsse.SSLContextParameters) value); return true;
             case "useGlobalSslContextParameters": ((ConsulComponent) component).setUseGlobalSslContextParameters((boolean) value); return true;
             case "userName": getOrCreateConfiguration((ConsulComponent) component).setUserName((java.lang.String) value); return true;
+            case "blockSeconds": getOrCreateConfiguration((ConsulComponent) component).setBlockSeconds((java.lang.Integer) value); return true;
+            case "firstIndex": getOrCreateConfiguration((ConsulComponent) component).setFirstIndex((java.math.BigInteger) value); return true;
+            case "recursive": getOrCreateConfiguration((ConsulComponent) component).setRecursive((boolean) value); return true;
             default: return false;
             }
         }
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java
index 144cad2..963dc9b 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GooglePubsubComponentBuilderFactory.java
@@ -23,7 +23,8 @@ import org.apache.camel.builder.component.ComponentBuilder;
 import org.apache.camel.component.google.pubsub.GooglePubsubComponent;
 
 /**
- * Messaging client for Google Cloud Platform PubSub Service
+ * Messaging client for Google Cloud Platform PubSub Service Built on top of the
+ * Google Cloud Pub/Sub libraries.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -32,7 +33,8 @@ public interface GooglePubsubComponentBuilderFactory {
 
     /**
      * Google Pubsub (camel-google-pubsub)
-     * Messaging client for Google Cloud Platform PubSub Service
+     * Messaging client for Google Cloud Platform PubSub Service Built on top of
+     * the Google Cloud Pub/Sub libraries.
      * 
      * Category: messaging
      * Since: 2.19
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
index 59f1d52..b572e7f 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JmsComponentBuilderFactory.java
@@ -1429,6 +1429,20 @@ public interface JmsComponentBuilderFactory {
             return this;
         }
         /**
+         * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
+         * header to and from Camel message.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
+         * 
+         * Group: filter
+         */
+        default JmsComponentBuilder headerFilterStrategy(
+                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
+            doSetProperty("headerFilterStrategy", headerFilterStrategy);
+            return this;
+        }
+        /**
          * Allows to configure the default errorHandler logging level for
          * logging uncaught exceptions.
          * 
@@ -1457,20 +1471,6 @@ public interface JmsComponentBuilderFactory {
             return this;
         }
         /**
-         * To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter
-         * header to and from Camel message.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.spi.HeaderFilterStrategy</code> type.
-         * 
-         * Group: filter
-         */
-        default JmsComponentBuilder headerFilterStrategy(
-                org.apache.camel.spi.HeaderFilterStrategy headerFilterStrategy) {
-            doSetProperty("headerFilterStrategy", headerFilterStrategy);
-            return this;
-        }
-        /**
          * Password to use with the ConnectionFactory. You can also configure
          * username/password directly on the ConnectionFactory.
          * 
@@ -1667,9 +1667,9 @@ public interface JmsComponentBuilderFactory {
             case "useMessageIDAsCorrelationID": getOrCreateConfiguration((JmsComponent) component).setUseMessageIDAsCorrelationID((boolean) value); return true;
             case "waitForProvisionCorrelationToBeUpdatedCounter": getOrCreateConfiguration((JmsComponent) component).setWaitForProvisionCorrelationToBeUpdatedCounter((int) value); return true;
             case "waitForProvisionCorrelationToBeUpdatedThreadSleepingTime": getOrCreateConfiguration((JmsComponent) component).setWaitForProvisionCorrelationToBeUpdatedThreadSleepingTime((long) value); return true;
+            case "headerFilterStrategy": ((JmsComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
             case "errorHandlerLoggingLevel": getOrCreateConfiguration((JmsComponent) component).setErrorHandlerLoggingLevel((org.apache.camel.LoggingLevel) value); return true;
             case "errorHandlerLogStackTrace": getOrCreateConfiguration((JmsComponent) component).setErrorHandlerLogStackTrace((boolean) value); return true;
-            case "headerFilterStrategy": ((JmsComponent) component).setHeaderFilterStrategy((org.apache.camel.spi.HeaderFilterStrategy) value); return true;
             case "password": getOrCreateConfiguration((JmsComponent) component).setPassword((java.lang.String) value); return true;
             case "username": getOrCreateConfiguration((JmsComponent) component).setUsername((java.lang.String) value); return true;
             case "transacted": getOrCreateConfiguration((JmsComponent) component).setTransacted((boolean) value); return true;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
index 4233237..1a53375 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
@@ -137,27 +137,6 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
             return this;
         }
         /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: producer
-         */
-        default XmlsecurityVerifyComponentBuilder lazyStartProducer(
-                boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-        /**
          * Sets the output node search value for determining the node from the
          * XML signature document which shall be set to the output message body.
          * The class of the value depends on the type of the output node search.
@@ -239,6 +218,27 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
             return this;
         }
         /**
+         * Whether the producer should be started lazy (on the first message).
+         * By starting lazy you can use this to allow CamelContext and routes to
+         * startup in situations where a producer may otherwise fail during
+         * starting and cause the route to fail being started. By deferring this
+         * startup to be lazy then the startup failure can be handled during
+         * routing messages via Camel's routing error handlers. Beware that when
+         * the first message is processed then creating and starting the
+         * producer may take a little time and prolong the total processing time
+         * of the processing.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: producer
+         */
+        default XmlsecurityVerifyComponentBuilder lazyStartProducer(
+                boolean lazyStartProducer) {
+            doSetProperty("lazyStartProducer", lazyStartProducer);
+            return this;
+        }
+        /**
          * Enables secure validation. If true then secure validation is enabled.
          * 
          * The option is a: <code>java.lang.Boolean</code> type.
@@ -394,12 +394,12 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
             case "disallowDoctypeDecl": getOrCreateConfiguration((XmlVerifierComponent) component).setDisallowDoctypeDecl((java.lang.Boolean) value); return true;
             case "keySelector": getOrCreateConfiguration((XmlVerifierComponent) component).setKeySelector((javax.xml.crypto.KeySelector) value); return true;
             case "omitXmlDeclaration": getOrCreateConfiguration((XmlVerifierComponent) component).setOmitXmlDeclaration((java.lang.Boolean) value); return true;
-            case "lazyStartProducer": ((XmlVerifierComponent) component).setLazyStartProducer((boolean) value); return true;
             case "outputNodeSearch": getOrCreateConfiguration((XmlVerifierComponent) component).setOutputNodeSearch((java.lang.Object) value); return true;
             case "outputNodeSearchType": getOrCreateConfiguration((XmlVerifierComponent) component).setOutputNodeSearchType((java.lang.String) value); return true;
             case "outputXmlEncoding": getOrCreateConfiguration((XmlVerifierComponent) component).setOutputXmlEncoding((java.lang.String) value); return true;
             case "removeSignatureElements": getOrCreateConfiguration((XmlVerifierComponent) component).setRemoveSignatureElements((java.lang.Boolean) value); return true;
             case "schemaResourceUri": getOrCreateConfiguration((XmlVerifierComponent) component).setSchemaResourceUri((java.lang.String) value); return true;
+            case "lazyStartProducer": ((XmlVerifierComponent) component).setLazyStartProducer((boolean) value); return true;
             case "secureValidation": getOrCreateConfiguration((XmlVerifierComponent) component).setSecureValidation((java.lang.Boolean) value); return true;
             case "validationFailedHandler": getOrCreateConfiguration((XmlVerifierComponent) component).setValidationFailedHandler((org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler) value); return true;
             case "xmlSignature2Message": getOrCreateConfiguration((XmlVerifierComponent) component).setXmlSignature2Message((org.apache.camel.component.xmlsecurity.api.XmlSignature2Message) value); return true;
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index 0c61454..26d83f1 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -2717,7 +2717,7 @@
     "extendsScheme": "",
     "syntax": "google-pubsub:projectId:destinationName",
     "title": "Google Pubsub",
-    "description": "Messaging client for Google Cloud Platform PubSub Service",
+    "description": "Messaging client for Google Cloud Platform PubSub Service Built on top of the Google Cloud Pub\/Sub libraries.",
     "label": "messaging",
     "deprecated": false,
     "deprecationNote": "messaging",
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
index 88ae3bc..385579d 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BoxEndpointBuilderFactory.java
@@ -158,6 +158,21 @@ public interface BoxEndpointBuilderFactory {
             return this;
         }
         /**
+         * The type of authentication for connection. Types of Authentication:
+         * STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION
+         * - OAuth 2.0 with JSON Web Tokens.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Default: APP_USER_AUTHENTICATION
+         * Group: authentication
+         */
+        default BoxEndpointConsumerBuilder authenticationType(
+                String authenticationType) {
+            doSetProperty("authenticationType", authenticationType);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -298,6 +313,34 @@ public interface BoxEndpointBuilderFactory {
             return this;
         }
         /**
+         * Milliseconds before the first poll starts. You can also specify time
+         * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+         * seconds), and 1h (1 hour).
+         * 
+         * The option is a: <code>long</code> type.
+         * 
+         * Default: 1000
+         * Group: scheduler
+         */
+        default BoxEndpointConsumerBuilder initialDelay(long initialDelay) {
+            doSetProperty("initialDelay", initialDelay);
+            return this;
+        }
+        /**
+         * Milliseconds before the first poll starts. You can also specify time
+         * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
+         * seconds), and 1h (1 hour).
+         * 
+         * The option will be converted to a <code>long</code> type.
+         * 
+         * Default: 1000
+         * Group: scheduler
+         */
+        default BoxEndpointConsumerBuilder initialDelay(String initialDelay) {
+            doSetProperty("initialDelay", initialDelay);
+            return this;
+        }
+        /**
          * Specifies a maximum limit of number of fires. So if you set it to 1,
          * the scheduler will only fire once. If you set it to 5, it will only
          * fire five times. A value of zero or negative means fire forever.
@@ -427,6 +470,30 @@ public interface BoxEndpointBuilderFactory {
             return this;
         }
         /**
+         * Whether the scheduler should be auto started.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: scheduler
+         */
+        default BoxEndpointConsumerBuilder startScheduler(boolean startScheduler) {
+            doSetProperty("startScheduler", startScheduler);
+            return this;
+        }
+        /**
+         * Whether the scheduler should be auto started.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: scheduler
+         */
+        default BoxEndpointConsumerBuilder startScheduler(String startScheduler) {
+            doSetProperty("startScheduler", startScheduler);
+            return this;
+        }
+        /**
          * Time unit for initialDelay and delay options.
          * 
          * The option is a: <code>java.util.concurrent.TimeUnit</code> type.
@@ -489,73 +556,6 @@ public interface BoxEndpointBuilderFactory {
             return this;
         }
         /**
-         * The type of authentication for connection. Types of Authentication:
-         * STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION
-         * - OAuth 2.0 with JSON Web Tokens.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: APP_USER_AUTHENTICATION
-         * Group: authentication
-         */
-        default BoxEndpointConsumerBuilder authenticationType(
-                String authenticationType) {
-            doSetProperty("authenticationType", authenticationType);
-            return this;
-        }
-        /**
-         * Milliseconds before the first poll starts. You can also specify time
-         * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour).
-         * 
-         * The option is a: <code>long</code> type.
-         * 
-         * Default: 1000
-         * Group: scheduler
-         */
-        default BoxEndpointConsumerBuilder initialDelay(long initialDelay) {
-            doSetProperty("initialDelay", initialDelay);
-            return this;
-        }
-        /**
-         * Milliseconds before the first poll starts. You can also specify time
-         * values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30
-         * seconds), and 1h (1 hour).
-         * 
-         * The option will be converted to a <code>long</code> type.
-         * 
-         * Default: 1000
-         * Group: scheduler
-         */
-        default BoxEndpointConsumerBuilder initialDelay(String initialDelay) {
-            doSetProperty("initialDelay", initialDelay);
-            return this;
-        }
-        /**
-         * Whether the scheduler should be auto started.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: scheduler
-         */
-        default BoxEndpointConsumerBuilder startScheduler(boolean startScheduler) {
-            doSetProperty("startScheduler", startScheduler);
-            return this;
-        }
-        /**
-         * Whether the scheduler should be auto started.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: scheduler
-         */
-        default BoxEndpointConsumerBuilder startScheduler(String startScheduler) {
-            doSetProperty("startScheduler", startScheduler);
-            return this;
-        }
-        /**
          * The private key for generating the JWT signature.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -998,17 +998,6 @@ public interface BoxEndpointBuilderFactory {
             return this;
         }
         /**
-         * Box application client secret.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default BoxEndpointProducerBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * The type of authentication for connection. Types of Authentication:
          * STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION
          * - OAuth 2.0 with JSON Web Tokens.
@@ -1024,6 +1013,17 @@ public interface BoxEndpointBuilderFactory {
             return this;
         }
         /**
+         * Box application client secret.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BoxEndpointProducerBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
          * The private key for generating the JWT signature.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -1336,17 +1336,6 @@ public interface BoxEndpointBuilderFactory {
             return this;
         }
         /**
-         * Box application client secret.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default BoxEndpointBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * The type of authentication for connection. Types of Authentication:
          * STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION
          * - OAuth 2.0 with JSON Web Tokens.
@@ -1361,6 +1350,17 @@ public interface BoxEndpointBuilderFactory {
             return this;
         }
         /**
+         * Box application client secret.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BoxEndpointBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
          * The private key for generating the JWT signature.
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
index acb91e5..75f593c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
@@ -148,6 +148,108 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option is a: <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder httpLogLevel(Level httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option will be converted to a
+         * <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder httpLogLevel(
+                String httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set log category to use to log http calls.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Default: Braintree
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder httpLogName(String httpLogName) {
+            doSetProperty("httpLogName", httpLogName);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder logHandlerEnabled(
+                boolean logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder logHandlerEnabled(
+                String logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
+         * The proxy host.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default BraintreeEndpointConsumerBuilder proxyHost(String proxyHost) {
+            doSetProperty("proxyHost", proxyHost);
+            return this;
+        }
+        /**
+         * The proxy port.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: proxy
+         */
+        default BraintreeEndpointConsumerBuilder proxyPort(Integer proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * The proxy port.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: proxy
+         */
+        default BraintreeEndpointConsumerBuilder proxyPort(String proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -525,108 +627,6 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option is a: <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default BraintreeEndpointConsumerBuilder httpLogLevel(Level httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option will be converted to a
-         * <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default BraintreeEndpointConsumerBuilder httpLogLevel(
-                String httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Set log category to use to log http calls.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Default: Braintree
-         * Group: logging
-         */
-        default BraintreeEndpointConsumerBuilder httpLogName(String httpLogName) {
-            doSetProperty("httpLogName", httpLogName);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default BraintreeEndpointConsumerBuilder logHandlerEnabled(
-                boolean logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default BraintreeEndpointConsumerBuilder logHandlerEnabled(
-                String logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
-        /**
-         * The proxy host.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default BraintreeEndpointConsumerBuilder proxyHost(String proxyHost) {
-            doSetProperty("proxyHost", proxyHost);
-            return this;
-        }
-        /**
-         * The proxy port.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: proxy
-         */
-        default BraintreeEndpointConsumerBuilder proxyPort(Integer proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
-         * The proxy port.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: proxy
-         */
-        default BraintreeEndpointConsumerBuilder proxyPort(String proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
          * The access token granted by a merchant to another in order to process
          * transactions on their behalf. Used in place of environment, merchant
          * id, public key and private key fields.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
index 7e27144..d4c486c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ConsulEndpointBuilderFactory.java
@@ -252,6 +252,67 @@ public interface ConsulEndpointBuilderFactory {
             return this;
         }
         /**
+         * Sets the ACL token to be used with Consul.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default ConsulEndpointConsumerBuilder aclToken(String aclToken) {
+            doSetProperty("aclToken", aclToken);
+            return this;
+        }
+        /**
+         * Sets the password to be used for basic authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default ConsulEndpointConsumerBuilder password(String password) {
+            doSetProperty("password", password);
+            return this;
+        }
+        /**
+         * SSL configuration using an
+         * org.apache.camel.support.jsse.SSLContextParameters instance.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default ConsulEndpointConsumerBuilder sslContextParameters(
+                Object sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * SSL configuration using an
+         * org.apache.camel.support.jsse.SSLContextParameters instance.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default ConsulEndpointConsumerBuilder sslContextParameters(
+                String sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * Sets the username to be used for basic authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default ConsulEndpointConsumerBuilder userName(String userName) {
+            doSetProperty("userName", userName);
+            return this;
+        }
+        /**
          * The second to wait for a watch event, default 10 seconds.
          * 
          * The option is a: <code>java.lang.Integer</code> type.
@@ -325,67 +386,6 @@ public interface ConsulEndpointBuilderFactory {
             doSetProperty("recursive", recursive);
             return this;
         }
-        /**
-         * Sets the ACL token to be used with Consul.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default ConsulEndpointConsumerBuilder aclToken(String aclToken) {
-            doSetProperty("aclToken", aclToken);
-            return this;
-        }
-        /**
-         * Sets the password to be used for basic authentication.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default ConsulEndpointConsumerBuilder password(String password) {
-            doSetProperty("password", password);
-            return this;
-        }
-        /**
-         * SSL configuration using an
-         * org.apache.camel.support.jsse.SSLContextParameters instance.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default ConsulEndpointConsumerBuilder sslContextParameters(
-                Object sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
-        /**
-         * SSL configuration using an
-         * org.apache.camel.support.jsse.SSLContextParameters instance.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default ConsulEndpointConsumerBuilder sslContextParameters(
-                String sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
-        /**
-         * Sets the username to be used for basic authentication.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default ConsulEndpointConsumerBuilder userName(String userName) {
-            doSetProperty("userName", userName);
-            return this;
-        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
index bc96774..51f3a8c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
@@ -255,6 +255,32 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default ElytronEndpointConsumerBuilder sslContextParameters(
+                Object sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default ElytronEndpointConsumerBuilder sslContextParameters(
+                String sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
          * if true, the consumer will post notifications to the route when a new
          * WebSocket peer connects, disconnects, etc. See
          * UndertowConstants.EVENT_TYPE and EventType.
@@ -284,32 +310,6 @@ public interface ElytronEndpointBuilderFactory {
             doSetProperty("fireWebSocketChannelEvents", fireWebSocketChannelEvents);
             return this;
         }
-        /**
-         * To configure security using SSLContextParameters.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default ElytronEndpointConsumerBuilder sslContextParameters(
-                Object sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
-        /**
-         * To configure security using SSLContextParameters.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default ElytronEndpointConsumerBuilder sslContextParameters(
-                String sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
     }
 
     /**
@@ -903,6 +903,32 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default ElytronEndpointProducerBuilder sslContextParameters(
+                Object sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default ElytronEndpointProducerBuilder sslContextParameters(
+                String sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
          * Timeout in milliseconds when sending to a websocket channel. The
          * default timeout is 30000 (30 seconds).
          * 
@@ -956,32 +982,6 @@ public interface ElytronEndpointBuilderFactory {
             doSetProperty("sendToAll", sendToAll);
             return this;
         }
-        /**
-         * To configure security using SSLContextParameters.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default ElytronEndpointProducerBuilder sslContextParameters(
-                Object sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
-        /**
-         * To configure security using SSLContextParameters.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default ElytronEndpointProducerBuilder sslContextParameters(
-                String sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
index fd384ac..6f720f0 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FhirEndpointBuilderFactory.java
@@ -233,6 +233,62 @@ public interface FhirEndpointBuilderFactory {
             return this;
         }
         /**
+         * The proxy host.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default FhirEndpointConsumerBuilder proxyHost(String proxyHost) {
+            doSetProperty("proxyHost", proxyHost);
+            return this;
+        }
+        /**
+         * The proxy password.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default FhirEndpointConsumerBuilder proxyPassword(String proxyPassword) {
+            doSetProperty("proxyPassword", proxyPassword);
+            return this;
+        }
+        /**
+         * The proxy port.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: proxy
+         */
+        default FhirEndpointConsumerBuilder proxyPort(Integer proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * The proxy port.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: proxy
+         */
+        default FhirEndpointConsumerBuilder proxyPort(String proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * The proxy username.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default FhirEndpointConsumerBuilder proxyUser(String proxyUser) {
+            doSetProperty("proxyUser", proxyUser);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -606,62 +662,6 @@ public interface FhirEndpointBuilderFactory {
             return this;
         }
         /**
-         * The proxy host.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default FhirEndpointConsumerBuilder proxyHost(String proxyHost) {
-            doSetProperty("proxyHost", proxyHost);
-            return this;
-        }
-        /**
-         * The proxy password.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default FhirEndpointConsumerBuilder proxyPassword(String proxyPassword) {
-            doSetProperty("proxyPassword", proxyPassword);
-            return this;
-        }
-        /**
-         * The proxy port.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: proxy
-         */
-        default FhirEndpointConsumerBuilder proxyPort(Integer proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
-         * The proxy port.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: proxy
-         */
-        default FhirEndpointConsumerBuilder proxyPort(String proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
-         * The proxy username.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default FhirEndpointConsumerBuilder proxyUser(String proxyUser) {
-            doSetProperty("proxyUser", proxyUser);
-            return this;
-        }
-        /**
          * OAuth access token.
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
index e083816..b84681e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
@@ -1849,6 +1849,39 @@ public interface FtpEndpointBuilderFactory {
             return this;
         }
         /**
+         * Account to use for login.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default FtpEndpointConsumerBuilder account(String account) {
+            doSetProperty("account", account);
+            return this;
+        }
+        /**
+         * Password to use for login.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default FtpEndpointConsumerBuilder password(String password) {
+            doSetProperty("password", password);
+            return this;
+        }
+        /**
+         * Username to use for login.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default FtpEndpointConsumerBuilder username(String username) {
+            doSetProperty("username", username);
+            return this;
+        }
+        /**
          * To shuffle the list of files (sort in random order).
          * 
          * The option is a: <code>boolean</code> type.
@@ -1926,39 +1959,6 @@ public interface FtpEndpointBuilderFactory {
             doSetProperty("sorter", sorter);
             return this;
         }
-        /**
-         * Account to use for login.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default FtpEndpointConsumerBuilder account(String account) {
-            doSetProperty("account", account);
-            return this;
-        }
-        /**
-         * Password to use for login.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default FtpEndpointConsumerBuilder password(String password) {
-            doSetProperty("password", password);
-            return this;
-        }
-        /**
-         * Username to use for login.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default FtpEndpointConsumerBuilder username(String username) {
-            doSetProperty("username", username);
-            return this;
-        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
index b1bbdda..3ac5695 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
@@ -1852,84 +1852,6 @@ public interface FtpsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To shuffle the list of files (sort in random order).
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: sort
-         */
-        default FtpsEndpointConsumerBuilder shuffle(boolean shuffle) {
-            doSetProperty("shuffle", shuffle);
-            return this;
-        }
-        /**
-         * To shuffle the list of files (sort in random order).
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: sort
-         */
-        default FtpsEndpointConsumerBuilder shuffle(String shuffle) {
-            doSetProperty("shuffle", shuffle);
-            return this;
-        }
-        /**
-         * Built-in sort by using the File Language. Supports nested sorts, so
-         * you can have a sort by file name and as a 2nd group sort by modified
-         * date.
-         * 
-         * The option is a:
-         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
-         * type.
-         * 
-         * Group: sort
-         */
-        default FtpsEndpointConsumerBuilder sortBy(Comparator<Exchange> sortBy) {
-            doSetProperty("sortBy", sortBy);
-            return this;
-        }
-        /**
-         * Built-in sort by using the File Language. Supports nested sorts, so
-         * you can have a sort by file name and as a 2nd group sort by modified
-         * date.
-         * 
-         * The option will be converted to a
-         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
-         * type.
-         * 
-         * Group: sort
-         */
-        default FtpsEndpointConsumerBuilder sortBy(String sortBy) {
-            doSetProperty("sortBy", sortBy);
-            return this;
-        }
-        /**
-         * Pluggable sorter as a java.util.Comparator class.
-         * 
-         * The option is a:
-         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.commons.net.ftp.FTPFile&gt;&gt;</code> type.
-         * 
-         * Group: sort
-         */
-        default FtpsEndpointConsumerBuilder sorter(Comparator<Object> sorter) {
-            doSetProperty("sorter", sorter);
-            return this;
-        }
-        /**
-         * Pluggable sorter as a java.util.Comparator class.
-         * 
-         * The option will be converted to a
-         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.commons.net.ftp.FTPFile&gt;&gt;</code> type.
-         * 
-         * Group: sort
-         */
-        default FtpsEndpointConsumerBuilder sorter(String sorter) {
-            doSetProperty("sorter", sorter);
-            return this;
-        }
-        /**
          * Account to use for login.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -2153,6 +2075,84 @@ public interface FtpsEndpointBuilderFactory {
             doSetProperty("username", username);
             return this;
         }
+        /**
+         * To shuffle the list of files (sort in random order).
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: sort
+         */
+        default FtpsEndpointConsumerBuilder shuffle(boolean shuffle) {
+            doSetProperty("shuffle", shuffle);
+            return this;
+        }
+        /**
+         * To shuffle the list of files (sort in random order).
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: sort
+         */
+        default FtpsEndpointConsumerBuilder shuffle(String shuffle) {
+            doSetProperty("shuffle", shuffle);
+            return this;
+        }
+        /**
+         * Built-in sort by using the File Language. Supports nested sorts, so
+         * you can have a sort by file name and as a 2nd group sort by modified
+         * date.
+         * 
+         * The option is a:
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
+         * 
+         * Group: sort
+         */
+        default FtpsEndpointConsumerBuilder sortBy(Comparator<Exchange> sortBy) {
+            doSetProperty("sortBy", sortBy);
+            return this;
+        }
+        /**
+         * Built-in sort by using the File Language. Supports nested sorts, so
+         * you can have a sort by file name and as a 2nd group sort by modified
+         * date.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
+         * 
+         * Group: sort
+         */
+        default FtpsEndpointConsumerBuilder sortBy(String sortBy) {
+            doSetProperty("sortBy", sortBy);
+            return this;
+        }
+        /**
+         * Pluggable sorter as a java.util.Comparator class.
+         * 
+         * The option is a:
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.commons.net.ftp.FTPFile&gt;&gt;</code> type.
+         * 
+         * Group: sort
+         */
+        default FtpsEndpointConsumerBuilder sorter(Comparator<Object> sorter) {
+            doSetProperty("sorter", sorter);
+            return this;
+        }
+        /**
+         * Pluggable sorter as a java.util.Comparator class.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.commons.net.ftp.FTPFile&gt;&gt;</code> type.
+         * 
+         * Group: sort
+         */
+        default FtpsEndpointConsumerBuilder sorter(String sorter) {
+            doSetProperty("sorter", sorter);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index 966d808..a8955f3 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -24,7 +24,8 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 
 /**
- * Messaging client for Google Cloud Platform PubSub Service
+ * Messaging client for Google Cloud Platform PubSub Service Built on top of the
+ * Google Cloud Pub/Sub libraries.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -780,7 +781,8 @@ public interface GooglePubsubEndpointBuilderFactory {
     public interface GooglePubsubBuilders {
         /**
          * Google Pubsub (camel-google-pubsub)
-         * Messaging client for Google Cloud Platform PubSub Service
+         * Messaging client for Google Cloud Platform PubSub Service Built on
+         * top of the Google Cloud Pub/Sub libraries.
          * 
          * Category: messaging
          * Since: 2.19
@@ -800,7 +802,8 @@ public interface GooglePubsubEndpointBuilderFactory {
     }
     /**
      * Google Pubsub (camel-google-pubsub)
-     * Messaging client for Google Cloud Platform PubSub Service
+     * Messaging client for Google Cloud Platform PubSub Service Built on top of
+     * the Google Cloud Pub/Sub libraries.
      * 
      * Category: messaging
      * Since: 2.19
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
index a3259e0..168323a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JMXEndpointBuilderFactory.java
@@ -165,79 +165,6 @@ public interface JMXEndpointBuilderFactory {
             return this;
         }
         /**
-         * If true, will fire a notification when the string attribute differs
-         * from the string to compare (string monitor or consumer). By default
-         * the consumer will notify match if observed attribute and string to
-         * compare has been configured.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: string
-         */
-        default JMXEndpointBuilder notifyDiffer(boolean notifyDiffer) {
-            doSetProperty("notifyDiffer", notifyDiffer);
-            return this;
-        }
-        /**
-         * If true, will fire a notification when the string attribute differs
-         * from the string to compare (string monitor or consumer). By default
-         * the consumer will notify match if observed attribute and string to
-         * compare has been configured.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: string
-         */
-        default JMXEndpointBuilder notifyDiffer(String notifyDiffer) {
-            doSetProperty("notifyDiffer", notifyDiffer);
-            return this;
-        }
-        /**
-         * If true, will fire a notification when the string attribute matches
-         * the string to compare (string monitor or consumer). By default the
-         * consumer will notify match if observed attribute and string to
-         * compare has been configured.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: string
-         */
-        default JMXEndpointBuilder notifyMatch(boolean notifyMatch) {
-            doSetProperty("notifyMatch", notifyMatch);
-            return this;
-        }
-        /**
-         * If true, will fire a notification when the string attribute matches
-         * the string to compare (string monitor or consumer). By default the
-         * consumer will notify match if observed attribute and string to
-         * compare has been configured.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: string
-         */
-        default JMXEndpointBuilder notifyMatch(String notifyMatch) {
-            doSetProperty("notifyMatch", notifyMatch);
-            return this;
-        }
-        /**
-         * Value for attribute to compare (string monitor or consumer). By
-         * default the consumer will notify match if observed attribute and
-         * string to compare has been configured.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: string
-         */
-        default JMXEndpointBuilder stringToCompare(String stringToCompare) {
-            doSetProperty("stringToCompare", stringToCompare);
-            return this;
-        }
-        /**
          * Initial threshold for the monitor. The value must exceed this before
          * notifications are fired (counter monitor only).
          * 
@@ -455,6 +382,79 @@ public interface JMXEndpointBuilderFactory {
             doSetProperty("user", user);
             return this;
         }
+        /**
+         * If true, will fire a notification when the string attribute differs
+         * from the string to compare (string monitor or consumer). By default
+         * the consumer will notify match if observed attribute and string to
+         * compare has been configured.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: string
+         */
+        default JMXEndpointBuilder notifyDiffer(boolean notifyDiffer) {
+            doSetProperty("notifyDiffer", notifyDiffer);
+            return this;
+        }
+        /**
+         * If true, will fire a notification when the string attribute differs
+         * from the string to compare (string monitor or consumer). By default
+         * the consumer will notify match if observed attribute and string to
+         * compare has been configured.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: string
+         */
+        default JMXEndpointBuilder notifyDiffer(String notifyDiffer) {
+            doSetProperty("notifyDiffer", notifyDiffer);
+            return this;
+        }
+        /**
+         * If true, will fire a notification when the string attribute matches
+         * the string to compare (string monitor or consumer). By default the
+         * consumer will notify match if observed attribute and string to
+         * compare has been configured.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: string
+         */
+        default JMXEndpointBuilder notifyMatch(boolean notifyMatch) {
+            doSetProperty("notifyMatch", notifyMatch);
+            return this;
+        }
+        /**
+         * If true, will fire a notification when the string attribute matches
+         * the string to compare (string monitor or consumer). By default the
+         * consumer will notify match if observed attribute and string to
+         * compare has been configured.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: string
+         */
+        default JMXEndpointBuilder notifyMatch(String notifyMatch) {
+            doSetProperty("notifyMatch", notifyMatch);
+            return this;
+        }
+        /**
+         * Value for attribute to compare (string monitor or consumer). By
+         * default the consumer will notify match if observed attribute and
+         * string to compare has been configured.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: string
+         */
+        default JMXEndpointBuilder stringToCompare(String stringToCompare) {
+            doSetProperty("stringToCompare", stringToCompare);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
index d5973ab..7061c89 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MailEndpointBuilderFactory.java
@@ -884,33 +884,6 @@ public interface MailEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sorting order for messages. Only natively supported for IMAP.
-         * Emulated to some degree when using POP3 or when IMAP server does not
-         * have the SORT capability.
-         * 
-         * The option is a: <code>com.sun.mail.imap.SortTerm[]</code> type.
-         * 
-         * Group: sort
-         */
-        default MailEndpointConsumerBuilder sortTerm(Object[] sortTerm) {
-            doSetProperty("sortTerm", sortTerm);
-            return this;
-        }
-        /**
-         * Sorting order for messages. Only natively supported for IMAP.
-         * Emulated to some degree when using POP3 or when IMAP server does not
-         * have the SORT capability.
-         * 
-         * The option will be converted to a
-         * <code>com.sun.mail.imap.SortTerm[]</code> type.
-         * 
-         * Group: sort
-         */
-        default MailEndpointConsumerBuilder sortTerm(String sortTerm) {
-            doSetProperty("sortTerm", sortTerm);
-            return this;
-        }
-        /**
          * The password for login.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -958,6 +931,33 @@ public interface MailEndpointBuilderFactory {
             doSetProperty("username", username);
             return this;
         }
+        /**
+         * Sorting order for messages. Only natively supported for IMAP.
+         * Emulated to some degree when using POP3 or when IMAP server does not
+         * have the SORT capability.
+         * 
+         * The option is a: <code>com.sun.mail.imap.SortTerm[]</code> type.
+         * 
+         * Group: sort
+         */
+        default MailEndpointConsumerBuilder sortTerm(Object[] sortTerm) {
+            doSetProperty("sortTerm", sortTerm);
+            return this;
+        }
+        /**
+         * Sorting order for messages. Only natively supported for IMAP.
+         * Emulated to some degree when using POP3 or when IMAP server does not
+         * have the SORT capability.
+         * 
+         * The option will be converted to a
+         * <code>com.sun.mail.imap.SortTerm[]</code> type.
+         * 
+         * Group: sort
+         */
+        default MailEndpointConsumerBuilder sortTerm(String sortTerm) {
+            doSetProperty("sortTerm", sortTerm);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
index 7180b8b..f4404e4 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/MllpEndpointBuilderFactory.java
@@ -493,6 +493,33 @@ public interface MllpEndpointBuilderFactory {
             return this;
         }
         /**
+         * Sets the SO_RCVBUF option to the specified value (in bytes).
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Default: 8192
+         * Group: tcp
+         */
+        default AdvancedMllpEndpointConsumerBuilder receiveBufferSize(
+                Integer receiveBufferSize) {
+            doSetProperty("receiveBufferSize", receiveBufferSize);
+            return this;
+        }
+        /**
+         * Sets the SO_RCVBUF option to the specified value (in bytes).
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Default: 8192
+         * Group: tcp
+         */
+        default AdvancedMllpEndpointConsumerBuilder receiveBufferSize(
+                String receiveBufferSize) {
+            doSetProperty("receiveBufferSize", receiveBufferSize);
+            return this;
+        }
+        /**
          * Enable/disable the SO_REUSEADDR socket option.
          * 
          * The option is a: <code>java.lang.Boolean</code> type.
@@ -520,6 +547,33 @@ public interface MllpEndpointBuilderFactory {
             return this;
         }
         /**
+         * Sets the SO_SNDBUF option to the specified value (in bytes).
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Default: 8192
+         * Group: tcp
+         */
+        default AdvancedMllpEndpointConsumerBuilder sendBufferSize(
+                Integer sendBufferSize) {
+            doSetProperty("sendBufferSize", sendBufferSize);
+            return this;
+        }
+        /**
+         * Sets the SO_SNDBUF option to the specified value (in bytes).
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Default: 8192
+         * Group: tcp
+         */
+        default AdvancedMllpEndpointConsumerBuilder sendBufferSize(
+                String sendBufferSize) {
+            doSetProperty("sendBufferSize", sendBufferSize);
+            return this;
+        }
+        /**
          * Timeout (in milliseconds) while waiting for a TCP connection TCP
          * Server Only.
          * 
@@ -603,33 +657,6 @@ public interface MllpEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets the SO_SNDBUF option to the specified value (in bytes).
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Default: 8192
-         * Group: tcp
-         */
-        default AdvancedMllpEndpointConsumerBuilder sendBufferSize(
-                Integer sendBufferSize) {
-            doSetProperty("sendBufferSize", sendBufferSize);
-            return this;
-        }
-        /**
-         * Sets the SO_SNDBUF option to the specified value (in bytes).
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Default: 8192
-         * Group: tcp
-         */
-        default AdvancedMllpEndpointConsumerBuilder sendBufferSize(
-                String sendBufferSize) {
-            doSetProperty("sendBufferSize", sendBufferSize);
-            return this;
-        }
-        /**
          * The approximate idle time allowed before the Client TCP Connection
          * will be reset. A null value or a value less than or equal to zero
          * will disable the idle timeout.
@@ -688,33 +715,6 @@ public interface MllpEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets the SO_RCVBUF option to the specified value (in bytes).
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Default: 8192
-         * Group: tcp
-         */
-        default AdvancedMllpEndpointConsumerBuilder receiveBufferSize(
-                Integer receiveBufferSize) {
-            doSetProperty("receiveBufferSize", receiveBufferSize);
-            return this;
-        }
-        /**
-         * Sets the SO_RCVBUF option to the specified value (in bytes).
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Default: 8192
-         * Group: tcp
-         */
-        default AdvancedMllpEndpointConsumerBuilder receiveBufferSize(
-                String receiveBufferSize) {
-            doSetProperty("receiveBufferSize", receiveBufferSize);
-            return this;
-        }
-        /**
          * The SO_TIMEOUT value (in milliseconds) used after the start of an
          * MLLP frame has been received.
          * 
@@ -1112,6 +1112,33 @@ public interface MllpEndpointBuilderFactory {
             return this;
         }
         /**
+         * Sets the SO_RCVBUF option to the specified value (in bytes).
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Default: 8192
+         * Group: tcp
+         */
+        default AdvancedMllpEndpointProducerBuilder receiveBufferSize(
+                Integer receiveBufferSize) {
+            doSetProperty("receiveBufferSize", receiveBufferSize);
+            return this;
+        }
+        /**
+         * Sets the SO_RCVBUF option to the specified value (in bytes).
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Default: 8192
+         * Group: tcp
+         */
+        default AdvancedMllpEndpointProducerBuilder receiveBufferSize(
+                String receiveBufferSize) {
+            doSetProperty("receiveBufferSize", receiveBufferSize);
+            return this;
+        }
+        /**
          * Sets the SO_SNDBUF option to the specified value (in bytes).
          * 
          * The option is a: <code>java.lang.Integer</code> type.
@@ -1222,33 +1249,6 @@ public interface MllpEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets the SO_RCVBUF option to the specified value (in bytes).
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Default: 8192
-         * Group: tcp
-         */
-        default AdvancedMllpEndpointProducerBuilder receiveBufferSize(
-                Integer receiveBufferSize) {
-            doSetProperty("receiveBufferSize", receiveBufferSize);
-            return this;
-        }
-        /**
-         * Sets the SO_RCVBUF option to the specified value (in bytes).
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Default: 8192
-         * Group: tcp
-         */
-        default AdvancedMllpEndpointProducerBuilder receiveBufferSize(
-                String receiveBufferSize) {
-            doSetProperty("receiveBufferSize", receiveBufferSize);
-            return this;
-        }
-        /**
          * The SO_TIMEOUT value (in milliseconds) used after the start of an
          * MLLP frame has been received.
          * 
@@ -1575,6 +1575,33 @@ public interface MllpEndpointBuilderFactory {
             return this;
         }
         /**
+         * Sets the SO_RCVBUF option to the specified value (in bytes).
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Default: 8192
+         * Group: tcp
+         */
+        default AdvancedMllpEndpointBuilder receiveBufferSize(
+                Integer receiveBufferSize) {
+            doSetProperty("receiveBufferSize", receiveBufferSize);
+            return this;
+        }
+        /**
+         * Sets the SO_RCVBUF option to the specified value (in bytes).
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Default: 8192
+         * Group: tcp
+         */
+        default AdvancedMllpEndpointBuilder receiveBufferSize(
+                String receiveBufferSize) {
+            doSetProperty("receiveBufferSize", receiveBufferSize);
+            return this;
+        }
+        /**
          * Sets the SO_SNDBUF option to the specified value (in bytes).
          * 
          * The option is a: <code>java.lang.Integer</code> type.
@@ -1628,33 +1655,6 @@ public interface MllpEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sets the SO_RCVBUF option to the specified value (in bytes).
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Default: 8192
-         * Group: tcp
-         */
-        default AdvancedMllpEndpointBuilder receiveBufferSize(
-                Integer receiveBufferSize) {
-            doSetProperty("receiveBufferSize", receiveBufferSize);
-            return this;
-        }
-        /**
-         * Sets the SO_RCVBUF option to the specified value (in bytes).
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Default: 8192
-         * Group: tcp
-         */
-        default AdvancedMllpEndpointBuilder receiveBufferSize(
-                String receiveBufferSize) {
-            doSetProperty("receiveBufferSize", receiveBufferSize);
-            return this;
-        }
-        /**
          * The SO_TIMEOUT value (in milliseconds) used after the start of an
          * MLLP frame has been received.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
index 8e1ca5f..f3212f0 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/S3EndpointBuilderFactory.java
@@ -1054,61 +1054,6 @@ public interface S3EndpointBuilderFactory {
             return this;
         }
         /**
-         * Whether the endpoint should use basic property binding (Camel 2.x) or
-         * the newer property binding with additional capabilities.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointConsumerBuilder basicPropertyBinding(
-                boolean basicPropertyBinding) {
-            doSetProperty("basicPropertyBinding", basicPropertyBinding);
-            return this;
-        }
-        /**
-         * Whether the endpoint should use basic property binding (Camel 2.x) or
-         * the newer property binding with additional capabilities.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointConsumerBuilder basicPropertyBinding(
-                String basicPropertyBinding) {
-            doSetProperty("basicPropertyBinding", basicPropertyBinding);
-            return this;
-        }
-        /**
-         * Sets whether synchronous processing should be strictly used, or Camel
-         * is allowed to use asynchronous processing (if supported).
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointConsumerBuilder synchronous(
-                boolean synchronous) {
-            doSetProperty("synchronous", synchronous);
-            return this;
-        }
-        /**
-         * Sets whether synchronous processing should be strictly used, or Camel
-         * is allowed to use asynchronous processing (if supported).
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointConsumerBuilder synchronous(String synchronous) {
-            doSetProperty("synchronous", synchronous);
-            return this;
-        }
-        /**
          * Define if Accelerate Mode enabled is true or false.
          * 
          * The option is a: <code>boolean</code> type.
@@ -1238,6 +1183,61 @@ public interface S3EndpointBuilderFactory {
             doSetProperty("payloadSigningEnabled", payloadSigningEnabled);
             return this;
         }
+        /**
+         * Whether the endpoint should use basic property binding (Camel 2.x) or
+         * the newer property binding with additional capabilities.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointConsumerBuilder basicPropertyBinding(
+                boolean basicPropertyBinding) {
+            doSetProperty("basicPropertyBinding", basicPropertyBinding);
+            return this;
+        }
+        /**
+         * Whether the endpoint should use basic property binding (Camel 2.x) or
+         * the newer property binding with additional capabilities.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointConsumerBuilder basicPropertyBinding(
+                String basicPropertyBinding) {
+            doSetProperty("basicPropertyBinding", basicPropertyBinding);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointConsumerBuilder synchronous(
+                boolean synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointConsumerBuilder synchronous(String synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
     }
 
     /**
@@ -1745,61 +1745,6 @@ public interface S3EndpointBuilderFactory {
             return this;
         }
         /**
-         * Whether the endpoint should use basic property binding (Camel 2.x) or
-         * the newer property binding with additional capabilities.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointProducerBuilder basicPropertyBinding(
-                boolean basicPropertyBinding) {
-            doSetProperty("basicPropertyBinding", basicPropertyBinding);
-            return this;
-        }
-        /**
-         * Whether the endpoint should use basic property binding (Camel 2.x) or
-         * the newer property binding with additional capabilities.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointProducerBuilder basicPropertyBinding(
-                String basicPropertyBinding) {
-            doSetProperty("basicPropertyBinding", basicPropertyBinding);
-            return this;
-        }
-        /**
-         * Sets whether synchronous processing should be strictly used, or Camel
-         * is allowed to use asynchronous processing (if supported).
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointProducerBuilder synchronous(
-                boolean synchronous) {
-            doSetProperty("synchronous", synchronous);
-            return this;
-        }
-        /**
-         * Sets whether synchronous processing should be strictly used, or Camel
-         * is allowed to use asynchronous processing (if supported).
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointProducerBuilder synchronous(String synchronous) {
-            doSetProperty("synchronous", synchronous);
-            return this;
-        }
-        /**
          * Define if Accelerate Mode enabled is true or false.
          * 
          * The option is a: <code>boolean</code> type.
@@ -1929,6 +1874,61 @@ public interface S3EndpointBuilderFactory {
             doSetProperty("payloadSigningEnabled", payloadSigningEnabled);
             return this;
         }
+        /**
+         * Whether the endpoint should use basic property binding (Camel 2.x) or
+         * the newer property binding with additional capabilities.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointProducerBuilder basicPropertyBinding(
+                boolean basicPropertyBinding) {
+            doSetProperty("basicPropertyBinding", basicPropertyBinding);
+            return this;
+        }
+        /**
+         * Whether the endpoint should use basic property binding (Camel 2.x) or
+         * the newer property binding with additional capabilities.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointProducerBuilder basicPropertyBinding(
+                String basicPropertyBinding) {
+            doSetProperty("basicPropertyBinding", basicPropertyBinding);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointProducerBuilder synchronous(
+                boolean synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointProducerBuilder synchronous(String synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
     }
 
     /**
@@ -2213,60 +2213,6 @@ public interface S3EndpointBuilderFactory {
             return this;
         }
         /**
-         * Whether the endpoint should use basic property binding (Camel 2.x) or
-         * the newer property binding with additional capabilities.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointBuilder basicPropertyBinding(
-                boolean basicPropertyBinding) {
-            doSetProperty("basicPropertyBinding", basicPropertyBinding);
-            return this;
-        }
-        /**
-         * Whether the endpoint should use basic property binding (Camel 2.x) or
-         * the newer property binding with additional capabilities.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointBuilder basicPropertyBinding(
-                String basicPropertyBinding) {
-            doSetProperty("basicPropertyBinding", basicPropertyBinding);
-            return this;
-        }
-        /**
-         * Sets whether synchronous processing should be strictly used, or Camel
-         * is allowed to use asynchronous processing (if supported).
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointBuilder synchronous(boolean synchronous) {
-            doSetProperty("synchronous", synchronous);
-            return this;
-        }
-        /**
-         * Sets whether synchronous processing should be strictly used, or Camel
-         * is allowed to use asynchronous processing (if supported).
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: advanced
-         */
-        default AdvancedS3EndpointBuilder synchronous(String synchronous) {
-            doSetProperty("synchronous", synchronous);
-            return this;
-        }
-        /**
          * Define if Accelerate Mode enabled is true or false.
          * 
          * The option is a: <code>boolean</code> type.
@@ -2396,6 +2342,60 @@ public interface S3EndpointBuilderFactory {
             doSetProperty("payloadSigningEnabled", payloadSigningEnabled);
             return this;
         }
+        /**
+         * Whether the endpoint should use basic property binding (Camel 2.x) or
+         * the newer property binding with additional capabilities.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointBuilder basicPropertyBinding(
+                boolean basicPropertyBinding) {
+            doSetProperty("basicPropertyBinding", basicPropertyBinding);
+            return this;
+        }
+        /**
+         * Whether the endpoint should use basic property binding (Camel 2.x) or
+         * the newer property binding with additional capabilities.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointBuilder basicPropertyBinding(
+                String basicPropertyBinding) {
+            doSetProperty("basicPropertyBinding", basicPropertyBinding);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointBuilder synchronous(boolean synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedS3EndpointBuilder synchronous(String synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SWFEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SWFEndpointBuilderFactory.java
index 2a069af..b141307 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SWFEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SWFEndpointBuilderFactory.java
@@ -271,6 +271,28 @@ public interface SWFEndpointBuilderFactory {
             return this;
         }
         /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default SWFEndpointConsumerBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
+         * Amazon AWS Secret Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default SWFEndpointConsumerBuilder secretKey(String secretKey) {
+            doSetProperty("secretKey", secretKey);
+            return this;
+        }
+        /**
          * The list name to consume workflows from.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -307,28 +329,6 @@ public interface SWFEndpointBuilderFactory {
             doSetProperty("workflowTypeRegistrationOptions", workflowTypeRegistrationOptions);
             return this;
         }
-        /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default SWFEndpointConsumerBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
-         * Amazon AWS Secret Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default SWFEndpointConsumerBuilder secretKey(String secretKey) {
-            doSetProperty("secretKey", secretKey);
-            return this;
-        }
     }
 
     /**
@@ -721,6 +721,28 @@ public interface SWFEndpointBuilderFactory {
             return this;
         }
         /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default SWFEndpointProducerBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
+         * Amazon AWS Secret Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default SWFEndpointProducerBuilder secretKey(String secretKey) {
+            doSetProperty("secretKey", secretKey);
+            return this;
+        }
+        /**
          * The policy to use on child workflows when terminating a workflow.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -816,28 +838,6 @@ public interface SWFEndpointBuilderFactory {
             doSetProperty("terminationReason", terminationReason);
             return this;
         }
-        /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default SWFEndpointProducerBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
-         * Amazon AWS Secret Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: security
-         */
-        default SWFEndpointProducerBuilder secretKey(String secretKey) {
-            doSetProperty("secretKey", secretKey);
-            return this;
-        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
index fc270b2..88a1f90 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SftpEndpointBuilderFactory.java
@@ -1896,84 +1896,6 @@ public interface SftpEndpointBuilderFactory {
             return this;
         }
         /**
-         * To shuffle the list of files (sort in random order).
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: sort
-         */
-        default SftpEndpointConsumerBuilder shuffle(boolean shuffle) {
-            doSetProperty("shuffle", shuffle);
-            return this;
-        }
-        /**
-         * To shuffle the list of files (sort in random order).
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: sort
-         */
-        default SftpEndpointConsumerBuilder shuffle(String shuffle) {
-            doSetProperty("shuffle", shuffle);
-            return this;
-        }
-        /**
-         * Built-in sort by using the File Language. Supports nested sorts, so
-         * you can have a sort by file name and as a 2nd group sort by modified
-         * date.
-         * 
-         * The option is a:
-         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
-         * type.
-         * 
-         * Group: sort
-         */
-        default SftpEndpointConsumerBuilder sortBy(Comparator<Exchange> sortBy) {
-            doSetProperty("sortBy", sortBy);
-            return this;
-        }
-        /**
-         * Built-in sort by using the File Language. Supports nested sorts, so
-         * you can have a sort by file name and as a 2nd group sort by modified
-         * date.
-         * 
-         * The option will be converted to a
-         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
-         * type.
-         * 
-         * Group: sort
-         */
-        default SftpEndpointConsumerBuilder sortBy(String sortBy) {
-            doSetProperty("sortBy", sortBy);
-            return this;
-        }
-        /**
-         * Pluggable sorter as a java.util.Comparator class.
-         * 
-         * The option is a:
-         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;&gt;</code> type.
-         * 
-         * Group: sort
-         */
-        default SftpEndpointConsumerBuilder sorter(Comparator<Object> sorter) {
-            doSetProperty("sorter", sorter);
-            return this;
-        }
-        /**
-         * Pluggable sorter as a java.util.Comparator class.
-         * 
-         * The option will be converted to a
-         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;&gt;</code> type.
-         * 
-         * Group: sort
-         */
-        default SftpEndpointConsumerBuilder sorter(String sorter) {
-            doSetProperty("sorter", sorter);
-            return this;
-        }
-        /**
          * Set a comma separated list of ciphers that will be used in order of
          * preference. Possible cipher names are defined by JCraft JSCH. Some
          * examples include:
@@ -2198,6 +2120,84 @@ public interface SftpEndpointBuilderFactory {
             doSetProperty("useUserKnownHostsFile", useUserKnownHostsFile);
             return this;
         }
+        /**
+         * To shuffle the list of files (sort in random order).
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: sort
+         */
+        default SftpEndpointConsumerBuilder shuffle(boolean shuffle) {
+            doSetProperty("shuffle", shuffle);
+            return this;
+        }
+        /**
+         * To shuffle the list of files (sort in random order).
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: sort
+         */
+        default SftpEndpointConsumerBuilder shuffle(String shuffle) {
+            doSetProperty("shuffle", shuffle);
+            return this;
+        }
+        /**
+         * Built-in sort by using the File Language. Supports nested sorts, so
+         * you can have a sort by file name and as a 2nd group sort by modified
+         * date.
+         * 
+         * The option is a:
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
+         * 
+         * Group: sort
+         */
+        default SftpEndpointConsumerBuilder sortBy(Comparator<Exchange> sortBy) {
+            doSetProperty("sortBy", sortBy);
+            return this;
+        }
+        /**
+         * Built-in sort by using the File Language. Supports nested sorts, so
+         * you can have a sort by file name and as a 2nd group sort by modified
+         * date.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
+         * 
+         * Group: sort
+         */
+        default SftpEndpointConsumerBuilder sortBy(String sortBy) {
+            doSetProperty("sortBy", sortBy);
+            return this;
+        }
+        /**
+         * Pluggable sorter as a java.util.Comparator class.
+         * 
+         * The option is a:
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;&gt;</code> type.
+         * 
+         * Group: sort
+         */
+        default SftpEndpointConsumerBuilder sorter(Comparator<Object> sorter) {
+            doSetProperty("sorter", sorter);
+            return this;
+        }
+        /**
+         * Pluggable sorter as a java.util.Comparator class.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;&gt;</code> type.
+         * 
+         * Group: sort
+         */
+        default SftpEndpointConsumerBuilder sorter(String sorter) {
+            doSetProperty("sorter", sorter);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
index 25f44ca..f006e4f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Sqs2EndpointBuilderFactory.java
@@ -598,6 +598,146 @@ public interface Sqs2EndpointBuilderFactory {
             return this;
         }
         /**
+         * To define a proxy host when instantiating the SQS client.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default Sqs2EndpointConsumerBuilder proxyHost(String proxyHost) {
+            doSetProperty("proxyHost", proxyHost);
+            return this;
+        }
+        /**
+         * To define a proxy port when instantiating the SQS client.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: proxy
+         */
+        default Sqs2EndpointConsumerBuilder proxyPort(Integer proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * To define a proxy port when instantiating the SQS client.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: proxy
+         */
+        default Sqs2EndpointConsumerBuilder proxyPort(String proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * The maximumMessageSize (in bytes) an SQS message can contain for this
+         * queue.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: queue
+         */
+        default Sqs2EndpointConsumerBuilder maximumMessageSize(
+                Integer maximumMessageSize) {
+            doSetProperty("maximumMessageSize", maximumMessageSize);
+            return this;
+        }
+        /**
+         * The maximumMessageSize (in bytes) an SQS message can contain for this
+         * queue.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: queue
+         */
+        default Sqs2EndpointConsumerBuilder maximumMessageSize(
+                String maximumMessageSize) {
+            doSetProperty("maximumMessageSize", maximumMessageSize);
+            return this;
+        }
+        /**
+         * The messageRetentionPeriod (in seconds) a message will be retained by
+         * SQS for this queue.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: queue
+         */
+        default Sqs2EndpointConsumerBuilder messageRetentionPeriod(
+                Integer messageRetentionPeriod) {
+            doSetProperty("messageRetentionPeriod", messageRetentionPeriod);
+            return this;
+        }
+        /**
+         * The messageRetentionPeriod (in seconds) a message will be retained by
+         * SQS for this queue.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: queue
+         */
+        default Sqs2EndpointConsumerBuilder messageRetentionPeriod(
+                String messageRetentionPeriod) {
+            doSetProperty("messageRetentionPeriod", messageRetentionPeriod);
+            return this;
+        }
+        /**
+         * The policy for this queue.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: queue
+         */
+        default Sqs2EndpointConsumerBuilder policy(String policy) {
+            doSetProperty("policy", policy);
+            return this;
+        }
+        /**
+         * If you do not specify WaitTimeSeconds in the request, the queue
+         * attribute ReceiveMessageWaitTimeSeconds is used to determine how long
+         * to wait.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: queue
+         */
+        default Sqs2EndpointConsumerBuilder receiveMessageWaitTimeSeconds(
+                Integer receiveMessageWaitTimeSeconds) {
+            doSetProperty("receiveMessageWaitTimeSeconds", receiveMessageWaitTimeSeconds);
+            return this;
+        }
+        /**
+         * If you do not specify WaitTimeSeconds in the request, the queue
+         * attribute ReceiveMessageWaitTimeSeconds is used to determine how long
+         * to wait.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: queue
+         */
+        default Sqs2EndpointConsumerBuilder receiveMessageWaitTimeSeconds(
+                String receiveMessageWaitTimeSeconds) {
+            doSetProperty("receiveMessageWaitTimeSeconds", receiveMessageWaitTimeSeconds);
+            return this;
+        }
+        /**
+         * Specify the policy that send message to DeadLetter queue. See detail
+         * at Amazon docs.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: queue
+         */
+        default Sqs2EndpointConsumerBuilder redrivePolicy(String redrivePolicy) {
+            doSetProperty("redrivePolicy", redrivePolicy);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -971,146 +1111,6 @@ public interface Sqs2EndpointBuilderFactory {
             return this;
         }
         /**
-         * To define a proxy host when instantiating the SQS client.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default Sqs2EndpointConsumerBuilder proxyHost(String proxyHost) {
-            doSetProperty("proxyHost", proxyHost);
-            return this;
-        }
-        /**
-         * To define a proxy port when instantiating the SQS client.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: proxy
-         */
-        default Sqs2EndpointConsumerBuilder proxyPort(Integer proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
-         * To define a proxy port when instantiating the SQS client.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: proxy
-         */
-        default Sqs2EndpointConsumerBuilder proxyPort(String proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
-         * The maximumMessageSize (in bytes) an SQS message can contain for this
-         * queue.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: queue
-         */
-        default Sqs2EndpointConsumerBuilder maximumMessageSize(
-                Integer maximumMessageSize) {
-            doSetProperty("maximumMessageSize", maximumMessageSize);
-            return this;
-        }
-        /**
-         * The maximumMessageSize (in bytes) an SQS message can contain for this
-         * queue.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: queue
-         */
-        default Sqs2EndpointConsumerBuilder maximumMessageSize(
-                String maximumMessageSize) {
-            doSetProperty("maximumMessageSize", maximumMessageSize);
-            return this;
-        }
-        /**
-         * The messageRetentionPeriod (in seconds) a message will be retained by
-         * SQS for this queue.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: queue
-         */
-        default Sqs2EndpointConsumerBuilder messageRetentionPeriod(
-                Integer messageRetentionPeriod) {
-            doSetProperty("messageRetentionPeriod", messageRetentionPeriod);
-            return this;
-        }
-        /**
-         * The messageRetentionPeriod (in seconds) a message will be retained by
-         * SQS for this queue.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: queue
-         */
-        default Sqs2EndpointConsumerBuilder messageRetentionPeriod(
-                String messageRetentionPeriod) {
-            doSetProperty("messageRetentionPeriod", messageRetentionPeriod);
-            return this;
-        }
-        /**
-         * The policy for this queue.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: queue
-         */
-        default Sqs2EndpointConsumerBuilder policy(String policy) {
-            doSetProperty("policy", policy);
-            return this;
-        }
-        /**
-         * If you do not specify WaitTimeSeconds in the request, the queue
-         * attribute ReceiveMessageWaitTimeSeconds is used to determine how long
-         * to wait.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: queue
-         */
-        default Sqs2EndpointConsumerBuilder receiveMessageWaitTimeSeconds(
-                Integer receiveMessageWaitTimeSeconds) {
-            doSetProperty("receiveMessageWaitTimeSeconds", receiveMessageWaitTimeSeconds);
-            return this;
-        }
-        /**
-         * If you do not specify WaitTimeSeconds in the request, the queue
-         * attribute ReceiveMessageWaitTimeSeconds is used to determine how long
-         * to wait.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: queue
-         */
-        default Sqs2EndpointConsumerBuilder receiveMessageWaitTimeSeconds(
-                String receiveMessageWaitTimeSeconds) {
-            doSetProperty("receiveMessageWaitTimeSeconds", receiveMessageWaitTimeSeconds);
-            return this;
-        }
-        /**
-         * Specify the policy that send message to DeadLetter queue. See detail
-         * at Amazon docs.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: queue
-         */
-        default Sqs2EndpointConsumerBuilder redrivePolicy(String redrivePolicy) {
-            doSetProperty("redrivePolicy", redrivePolicy);
-            return this;
-        }
-        /**
          * Amazon AWS Access Key.
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
index bb429fa..1d94297 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SqsEndpointBuilderFactory.java
@@ -598,6 +598,146 @@ public interface SqsEndpointBuilderFactory {
             return this;
         }
         /**
+         * To define a proxy host when instantiating the SQS client.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default SqsEndpointConsumerBuilder proxyHost(String proxyHost) {
+            doSetProperty("proxyHost", proxyHost);
+            return this;
+        }
+        /**
+         * To define a proxy port when instantiating the SQS client.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: proxy
+         */
+        default SqsEndpointConsumerBuilder proxyPort(Integer proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * To define a proxy port when instantiating the SQS client.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: proxy
+         */
+        default SqsEndpointConsumerBuilder proxyPort(String proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * The maximumMessageSize (in bytes) an SQS message can contain for this
+         * queue.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: queue
+         */
+        default SqsEndpointConsumerBuilder maximumMessageSize(
+                Integer maximumMessageSize) {
+            doSetProperty("maximumMessageSize", maximumMessageSize);
+            return this;
+        }
+        /**
+         * The maximumMessageSize (in bytes) an SQS message can contain for this
+         * queue.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: queue
+         */
+        default SqsEndpointConsumerBuilder maximumMessageSize(
+                String maximumMessageSize) {
+            doSetProperty("maximumMessageSize", maximumMessageSize);
+            return this;
+        }
+        /**
+         * The messageRetentionPeriod (in seconds) a message will be retained by
+         * SQS for this queue.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: queue
+         */
+        default SqsEndpointConsumerBuilder messageRetentionPeriod(
+                Integer messageRetentionPeriod) {
+            doSetProperty("messageRetentionPeriod", messageRetentionPeriod);
+            return this;
+        }
+        /**
+         * The messageRetentionPeriod (in seconds) a message will be retained by
+         * SQS for this queue.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: queue
+         */
+        default SqsEndpointConsumerBuilder messageRetentionPeriod(
+                String messageRetentionPeriod) {
+            doSetProperty("messageRetentionPeriod", messageRetentionPeriod);
+            return this;
+        }
+        /**
+         * The policy for this queue.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: queue
+         */
+        default SqsEndpointConsumerBuilder policy(String policy) {
+            doSetProperty("policy", policy);
+            return this;
+        }
+        /**
+         * If you do not specify WaitTimeSeconds in the request, the queue
+         * attribute ReceiveMessageWaitTimeSeconds is used to determine how long
+         * to wait.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: queue
+         */
+        default SqsEndpointConsumerBuilder receiveMessageWaitTimeSeconds(
+                Integer receiveMessageWaitTimeSeconds) {
+            doSetProperty("receiveMessageWaitTimeSeconds", receiveMessageWaitTimeSeconds);
+            return this;
+        }
+        /**
+         * If you do not specify WaitTimeSeconds in the request, the queue
+         * attribute ReceiveMessageWaitTimeSeconds is used to determine how long
+         * to wait.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: queue
+         */
+        default SqsEndpointConsumerBuilder receiveMessageWaitTimeSeconds(
+                String receiveMessageWaitTimeSeconds) {
+            doSetProperty("receiveMessageWaitTimeSeconds", receiveMessageWaitTimeSeconds);
+            return this;
+        }
+        /**
+         * Specify the policy that send message to DeadLetter queue. See detail
+         * at Amazon docs.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: queue
+         */
+        default SqsEndpointConsumerBuilder redrivePolicy(String redrivePolicy) {
+            doSetProperty("redrivePolicy", redrivePolicy);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -970,146 +1110,6 @@ public interface SqsEndpointBuilderFactory {
             return this;
         }
         /**
-         * To define a proxy host when instantiating the SQS client.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default SqsEndpointConsumerBuilder proxyHost(String proxyHost) {
-            doSetProperty("proxyHost", proxyHost);
-            return this;
-        }
-        /**
-         * To define a proxy port when instantiating the SQS client.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: proxy
-         */
-        default SqsEndpointConsumerBuilder proxyPort(Integer proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
-         * To define a proxy port when instantiating the SQS client.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: proxy
-         */
-        default SqsEndpointConsumerBuilder proxyPort(String proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
-         * The maximumMessageSize (in bytes) an SQS message can contain for this
-         * queue.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: queue
-         */
-        default SqsEndpointConsumerBuilder maximumMessageSize(
-                Integer maximumMessageSize) {
-            doSetProperty("maximumMessageSize", maximumMessageSize);
-            return this;
-        }
-        /**
-         * The maximumMessageSize (in bytes) an SQS message can contain for this
-         * queue.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: queue
-         */
-        default SqsEndpointConsumerBuilder maximumMessageSize(
-                String maximumMessageSize) {
-            doSetProperty("maximumMessageSize", maximumMessageSize);
-            return this;
-        }
-        /**
-         * The messageRetentionPeriod (in seconds) a message will be retained by
-         * SQS for this queue.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: queue
-         */
-        default SqsEndpointConsumerBuilder messageRetentionPeriod(
-                Integer messageRetentionPeriod) {
-            doSetProperty("messageRetentionPeriod", messageRetentionPeriod);
-            return this;
-        }
-        /**
-         * The messageRetentionPeriod (in seconds) a message will be retained by
-         * SQS for this queue.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: queue
-         */
-        default SqsEndpointConsumerBuilder messageRetentionPeriod(
-                String messageRetentionPeriod) {
-            doSetProperty("messageRetentionPeriod", messageRetentionPeriod);
-            return this;
-        }
-        /**
-         * The policy for this queue.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: queue
-         */
-        default SqsEndpointConsumerBuilder policy(String policy) {
-            doSetProperty("policy", policy);
-            return this;
-        }
-        /**
-         * If you do not specify WaitTimeSeconds in the request, the queue
-         * attribute ReceiveMessageWaitTimeSeconds is used to determine how long
-         * to wait.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: queue
-         */
-        default SqsEndpointConsumerBuilder receiveMessageWaitTimeSeconds(
-                Integer receiveMessageWaitTimeSeconds) {
-            doSetProperty("receiveMessageWaitTimeSeconds", receiveMessageWaitTimeSeconds);
-            return this;
-        }
-        /**
-         * If you do not specify WaitTimeSeconds in the request, the queue
-         * attribute ReceiveMessageWaitTimeSeconds is used to determine how long
-         * to wait.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: queue
-         */
-        default SqsEndpointConsumerBuilder receiveMessageWaitTimeSeconds(
-                String receiveMessageWaitTimeSeconds) {
-            doSetProperty("receiveMessageWaitTimeSeconds", receiveMessageWaitTimeSeconds);
-            return this;
-        }
-        /**
-         * Specify the policy that send message to DeadLetter queue. See detail
-         * at Amazon docs.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: queue
-         */
-        default SqsEndpointConsumerBuilder redrivePolicy(String redrivePolicy) {
-            doSetProperty("redrivePolicy", redrivePolicy);
-            return this;
-        }
-        /**
          * Amazon AWS Access Key.
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java
index b52444f..38cc72e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TelegramEndpointBuilderFactory.java
@@ -169,6 +169,40 @@ public interface TelegramEndpointBuilderFactory {
             return this;
         }
         /**
+         * HTTP proxy host which could be used when sending out the message.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TelegramEndpointConsumerBuilder proxyHost(String proxyHost) {
+            doSetProperty("proxyHost", proxyHost);
+            return this;
+        }
+        /**
+         * HTTP proxy port which could be used when sending out the message.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: proxy
+         */
+        default TelegramEndpointConsumerBuilder proxyPort(Integer proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * HTTP proxy port which could be used when sending out the message.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: proxy
+         */
+        default TelegramEndpointConsumerBuilder proxyPort(String proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -545,40 +579,6 @@ public interface TelegramEndpointBuilderFactory {
             return this;
         }
         /**
-         * HTTP proxy host which could be used when sending out the message.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TelegramEndpointConsumerBuilder proxyHost(String proxyHost) {
-            doSetProperty("proxyHost", proxyHost);
-            return this;
-        }
-        /**
-         * HTTP proxy port which could be used when sending out the message.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: proxy
-         */
-        default TelegramEndpointConsumerBuilder proxyPort(Integer proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
-         * HTTP proxy port which could be used when sending out the message.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: proxy
-         */
-        default TelegramEndpointConsumerBuilder proxyPort(String proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
          * The authorization token for using the bot (ask the BotFather).
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
index 8842472..a21555e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterDirectMessageEndpointBuilderFactory.java
@@ -274,6 +274,72 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
             return this;
         }
         /**
+         * The http proxy host which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterDirectMessageEndpointConsumerBuilder httpProxyHost(
+                String httpProxyHost) {
+            doSetProperty("httpProxyHost", httpProxyHost);
+            return this;
+        }
+        /**
+         * The http proxy password which can be used for the camel-twitter. Can
+         * also be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterDirectMessageEndpointConsumerBuilder httpProxyPassword(
+                String httpProxyPassword) {
+            doSetProperty("httpProxyPassword", httpProxyPassword);
+            return this;
+        }
+        /**
+         * The http proxy port which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterDirectMessageEndpointConsumerBuilder httpProxyPort(
+                Integer httpProxyPort) {
+            doSetProperty("httpProxyPort", httpProxyPort);
+            return this;
+        }
+        /**
+         * The http proxy port which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: proxy
+         */
+        default TwitterDirectMessageEndpointConsumerBuilder httpProxyPort(
+                String httpProxyPort) {
+            doSetProperty("httpProxyPort", httpProxyPort);
+            return this;
+        }
+        /**
+         * The http proxy user which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterDirectMessageEndpointConsumerBuilder httpProxyUser(
+                String httpProxyUser) {
+            doSetProperty("httpProxyUser", httpProxyUser);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -654,98 +720,6 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sorts by id, so the oldest are first, and newest last.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: sort
-         */
-        default TwitterDirectMessageEndpointConsumerBuilder sortById(
-                boolean sortById) {
-            doSetProperty("sortById", sortById);
-            return this;
-        }
-        /**
-         * Sorts by id, so the oldest are first, and newest last.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: sort
-         */
-        default TwitterDirectMessageEndpointConsumerBuilder sortById(
-                String sortById) {
-            doSetProperty("sortById", sortById);
-            return this;
-        }
-        /**
-         * The http proxy host which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterDirectMessageEndpointConsumerBuilder httpProxyHost(
-                String httpProxyHost) {
-            doSetProperty("httpProxyHost", httpProxyHost);
-            return this;
-        }
-        /**
-         * The http proxy password which can be used for the camel-twitter. Can
-         * also be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterDirectMessageEndpointConsumerBuilder httpProxyPassword(
-                String httpProxyPassword) {
-            doSetProperty("httpProxyPassword", httpProxyPassword);
-            return this;
-        }
-        /**
-         * The http proxy port which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterDirectMessageEndpointConsumerBuilder httpProxyPort(
-                Integer httpProxyPort) {
-            doSetProperty("httpProxyPort", httpProxyPort);
-            return this;
-        }
-        /**
-         * The http proxy port which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: proxy
-         */
-        default TwitterDirectMessageEndpointConsumerBuilder httpProxyPort(
-                String httpProxyPort) {
-            doSetProperty("httpProxyPort", httpProxyPort);
-            return this;
-        }
-        /**
-         * The http proxy user which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterDirectMessageEndpointConsumerBuilder httpProxyUser(
-                String httpProxyUser) {
-            doSetProperty("httpProxyUser", httpProxyUser);
-            return this;
-        }
-        /**
          * The access token. Can also be configured on the TwitterComponent
          * level instead.
          * 
@@ -797,6 +771,32 @@ public interface TwitterDirectMessageEndpointBuilderFactory {
             doSetProperty("consumerSecret", consumerSecret);
             return this;
         }
+        /**
+         * Sorts by id, so the oldest are first, and newest last.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: sort
+         */
+        default TwitterDirectMessageEndpointConsumerBuilder sortById(
+                boolean sortById) {
+            doSetProperty("sortById", sortById);
+            return this;
+        }
+        /**
+         * Sorts by id, so the oldest are first, and newest last.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: sort
+         */
+        default TwitterDirectMessageEndpointConsumerBuilder sortById(
+                String sortById) {
+            doSetProperty("sortById", sortById);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
index 30d8bb6..11d350d 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterSearchEndpointBuilderFactory.java
@@ -268,6 +268,72 @@ public interface TwitterSearchEndpointBuilderFactory {
             return this;
         }
         /**
+         * The http proxy host which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterSearchEndpointConsumerBuilder httpProxyHost(
+                String httpProxyHost) {
+            doSetProperty("httpProxyHost", httpProxyHost);
+            return this;
+        }
+        /**
+         * The http proxy password which can be used for the camel-twitter. Can
+         * also be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterSearchEndpointConsumerBuilder httpProxyPassword(
+                String httpProxyPassword) {
+            doSetProperty("httpProxyPassword", httpProxyPassword);
+            return this;
+        }
+        /**
+         * The http proxy port which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterSearchEndpointConsumerBuilder httpProxyPort(
+                Integer httpProxyPort) {
+            doSetProperty("httpProxyPort", httpProxyPort);
+            return this;
+        }
+        /**
+         * The http proxy port which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: proxy
+         */
+        default TwitterSearchEndpointConsumerBuilder httpProxyPort(
+                String httpProxyPort) {
+            doSetProperty("httpProxyPort", httpProxyPort);
+            return this;
+        }
+        /**
+         * The http proxy user which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterSearchEndpointConsumerBuilder httpProxyUser(
+                String httpProxyUser) {
+            doSetProperty("httpProxyUser", httpProxyUser);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -644,96 +710,6 @@ public interface TwitterSearchEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sorts by id, so the oldest are first, and newest last.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: sort
-         */
-        default TwitterSearchEndpointConsumerBuilder sortById(boolean sortById) {
-            doSetProperty("sortById", sortById);
-            return this;
-        }
-        /**
-         * Sorts by id, so the oldest are first, and newest last.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: sort
-         */
-        default TwitterSearchEndpointConsumerBuilder sortById(String sortById) {
-            doSetProperty("sortById", sortById);
-            return this;
-        }
-        /**
-         * The http proxy host which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterSearchEndpointConsumerBuilder httpProxyHost(
-                String httpProxyHost) {
-            doSetProperty("httpProxyHost", httpProxyHost);
-            return this;
-        }
-        /**
-         * The http proxy password which can be used for the camel-twitter. Can
-         * also be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterSearchEndpointConsumerBuilder httpProxyPassword(
-                String httpProxyPassword) {
-            doSetProperty("httpProxyPassword", httpProxyPassword);
-            return this;
-        }
-        /**
-         * The http proxy port which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterSearchEndpointConsumerBuilder httpProxyPort(
-                Integer httpProxyPort) {
-            doSetProperty("httpProxyPort", httpProxyPort);
-            return this;
-        }
-        /**
-         * The http proxy port which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: proxy
-         */
-        default TwitterSearchEndpointConsumerBuilder httpProxyPort(
-                String httpProxyPort) {
-            doSetProperty("httpProxyPort", httpProxyPort);
-            return this;
-        }
-        /**
-         * The http proxy user which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterSearchEndpointConsumerBuilder httpProxyUser(
-                String httpProxyUser) {
-            doSetProperty("httpProxyUser", httpProxyUser);
-            return this;
-        }
-        /**
          * The access token. Can also be configured on the TwitterComponent
          * level instead.
          * 
@@ -785,6 +761,30 @@ public interface TwitterSearchEndpointBuilderFactory {
             doSetProperty("consumerSecret", consumerSecret);
             return this;
         }
+        /**
+         * Sorts by id, so the oldest are first, and newest last.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: sort
+         */
+        default TwitterSearchEndpointConsumerBuilder sortById(boolean sortById) {
+            doSetProperty("sortById", sortById);
+            return this;
+        }
+        /**
+         * Sorts by id, so the oldest are first, and newest last.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: sort
+         */
+        default TwitterSearchEndpointConsumerBuilder sortById(String sortById) {
+            doSetProperty("sortById", sortById);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
index dd50ebc..a7e7955 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/TwitterTimelineEndpointBuilderFactory.java
@@ -282,6 +282,72 @@ public interface TwitterTimelineEndpointBuilderFactory {
             return this;
         }
         /**
+         * The http proxy host which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterTimelineEndpointConsumerBuilder httpProxyHost(
+                String httpProxyHost) {
+            doSetProperty("httpProxyHost", httpProxyHost);
+            return this;
+        }
+        /**
+         * The http proxy password which can be used for the camel-twitter. Can
+         * also be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterTimelineEndpointConsumerBuilder httpProxyPassword(
+                String httpProxyPassword) {
+            doSetProperty("httpProxyPassword", httpProxyPassword);
+            return this;
+        }
+        /**
+         * The http proxy port which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterTimelineEndpointConsumerBuilder httpProxyPort(
+                Integer httpProxyPort) {
+            doSetProperty("httpProxyPort", httpProxyPort);
+            return this;
+        }
+        /**
+         * The http proxy port which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: proxy
+         */
+        default TwitterTimelineEndpointConsumerBuilder httpProxyPort(
+                String httpProxyPort) {
+            doSetProperty("httpProxyPort", httpProxyPort);
+            return this;
+        }
+        /**
+         * The http proxy user which can be used for the camel-twitter. Can also
+         * be configured on the TwitterComponent level instead.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default TwitterTimelineEndpointConsumerBuilder httpProxyUser(
+                String httpProxyUser) {
+            doSetProperty("httpProxyUser", httpProxyUser);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -660,96 +726,6 @@ public interface TwitterTimelineEndpointBuilderFactory {
             return this;
         }
         /**
-         * Sorts by id, so the oldest are first, and newest last.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: sort
-         */
-        default TwitterTimelineEndpointConsumerBuilder sortById(boolean sortById) {
-            doSetProperty("sortById", sortById);
-            return this;
-        }
-        /**
-         * Sorts by id, so the oldest are first, and newest last.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: sort
-         */
-        default TwitterTimelineEndpointConsumerBuilder sortById(String sortById) {
-            doSetProperty("sortById", sortById);
-            return this;
-        }
-        /**
-         * The http proxy host which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterTimelineEndpointConsumerBuilder httpProxyHost(
-                String httpProxyHost) {
-            doSetProperty("httpProxyHost", httpProxyHost);
-            return this;
-        }
-        /**
-         * The http proxy password which can be used for the camel-twitter. Can
-         * also be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterTimelineEndpointConsumerBuilder httpProxyPassword(
-                String httpProxyPassword) {
-            doSetProperty("httpProxyPassword", httpProxyPassword);
-            return this;
-        }
-        /**
-         * The http proxy port which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterTimelineEndpointConsumerBuilder httpProxyPort(
-                Integer httpProxyPort) {
-            doSetProperty("httpProxyPort", httpProxyPort);
-            return this;
-        }
-        /**
-         * The http proxy port which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: proxy
-         */
-        default TwitterTimelineEndpointConsumerBuilder httpProxyPort(
-                String httpProxyPort) {
-            doSetProperty("httpProxyPort", httpProxyPort);
-            return this;
-        }
-        /**
-         * The http proxy user which can be used for the camel-twitter. Can also
-         * be configured on the TwitterComponent level instead.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default TwitterTimelineEndpointConsumerBuilder httpProxyUser(
-                String httpProxyUser) {
-            doSetProperty("httpProxyUser", httpProxyUser);
-            return this;
-        }
-        /**
          * The access token. Can also be configured on the TwitterComponent
          * level instead.
          * 
@@ -801,6 +777,30 @@ public interface TwitterTimelineEndpointBuilderFactory {
             doSetProperty("consumerSecret", consumerSecret);
             return this;
         }
+        /**
+         * Sorts by id, so the oldest are first, and newest last.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: sort
+         */
+        default TwitterTimelineEndpointConsumerBuilder sortById(boolean sortById) {
+            doSetProperty("sortById", sortById);
+            return this;
+        }
+        /**
+         * Sorts by id, so the oldest are first, and newest last.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: sort
+         */
+        default TwitterTimelineEndpointConsumerBuilder sortById(String sortById) {
+            doSetProperty("sortById", sortById);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java
index f0032e0..26c18ab 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/UndertowEndpointBuilderFactory.java
@@ -245,6 +245,32 @@ public interface UndertowEndpointBuilderFactory {
             return this;
         }
         /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default UndertowEndpointConsumerBuilder sslContextParameters(
+                Object sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default UndertowEndpointConsumerBuilder sslContextParameters(
+                String sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
          * if true, the consumer will post notifications to the route when a new
          * WebSocket peer connects, disconnects, etc. See
          * UndertowConstants.EVENT_TYPE and EventType.
@@ -274,32 +300,6 @@ public interface UndertowEndpointBuilderFactory {
             doSetProperty("fireWebSocketChannelEvents", fireWebSocketChannelEvents);
             return this;
         }
-        /**
-         * To configure security using SSLContextParameters.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default UndertowEndpointConsumerBuilder sslContextParameters(
-                Object sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
-        /**
-         * To configure security using SSLContextParameters.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default UndertowEndpointConsumerBuilder sslContextParameters(
-                String sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
     }
 
     /**
@@ -883,6 +883,32 @@ public interface UndertowEndpointBuilderFactory {
             return this;
         }
         /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default UndertowEndpointProducerBuilder sslContextParameters(
+                Object sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default UndertowEndpointProducerBuilder sslContextParameters(
+                String sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
          * Timeout in milliseconds when sending to a websocket channel. The
          * default timeout is 30000 (30 seconds).
          * 
@@ -936,32 +962,6 @@ public interface UndertowEndpointBuilderFactory {
             doSetProperty("sendToAll", sendToAll);
             return this;
         }
-        /**
-         * To configure security using SSLContextParameters.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default UndertowEndpointProducerBuilder sslContextParameters(
-                Object sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
-        /**
-         * To configure security using SSLContextParameters.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
-         * 
-         * Group: security
-         */
-        default UndertowEndpointProducerBuilder sslContextParameters(
-                String sslContextParameters) {
-            doSetProperty("sslContextParameters", sslContextParameters);
-            return this;
-        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
index 1e37bc9..db57c08 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WeatherEndpointBuilderFactory.java
@@ -254,6 +254,251 @@ public interface WeatherEndpointBuilderFactory {
             return this;
         }
         /**
+         * Number of results to be found.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder cnt(Integer cnt) {
+            doSetProperty("cnt", cnt);
+            return this;
+        }
+        /**
+         * Number of results to be found.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder cnt(String cnt) {
+            doSetProperty("cnt", cnt);
+            return this;
+        }
+        /**
+         * List of id's of city/stations. You can separate multiple ids by
+         * comma.
+         * 
+         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder ids(List<String> ids) {
+            doSetProperty("ids", ids);
+            return this;
+        }
+        /**
+         * List of id's of city/stations. You can separate multiple ids by
+         * comma.
+         * 
+         * The option will be converted to a
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder ids(String ids) {
+            doSetProperty("ids", ids);
+            return this;
+        }
+        /**
+         * Latitude of location. You can use lat and lon options instead of
+         * location. For boxed queries this is the bottom latitude.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder lat(String lat) {
+            doSetProperty("lat", lat);
+            return this;
+        }
+        /**
+         * If null Camel will try and determine your current location using the
+         * geolocation of your ip address, else specify the city,country. For
+         * well known city names, Open Weather Map will determine the best fit,
+         * but multiple results may be returned. Hence specifying and country as
+         * well will return more accurate data. If you specify current as the
+         * location then the component will try to get the current latitude and
+         * longitude and use that to get the weather details. You can use lat
+         * and lon options instead of location.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder location(String location) {
+            doSetProperty("location", location);
+            return this;
+        }
+        /**
+         * Longitude of location. You can use lat and lon options instead of
+         * location. For boxed queries this is the left longtitude.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder lon(String lon) {
+            doSetProperty("lon", lon);
+            return this;
+        }
+        /**
+         * For boxed queries this is the right longtitude. Needs to be used in
+         * combination with topLat and zoom.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder rightLon(String rightLon) {
+            doSetProperty("rightLon", rightLon);
+            return this;
+        }
+        /**
+         * For boxed queries this is the top latitude. Needs to be used in
+         * combination with rightLon and zoom.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder topLat(String topLat) {
+            doSetProperty("topLat", topLat);
+            return this;
+        }
+        /**
+         * Zip-code, e.g. 94040,us.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder zip(String zip) {
+            doSetProperty("zip", zip);
+            return this;
+        }
+        /**
+         * For boxed queries this is the zoom. Needs to be used in combination
+         * with rightLon and topLat.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder zoom(Integer zoom) {
+            doSetProperty("zoom", zoom);
+            return this;
+        }
+        /**
+         * For boxed queries this is the zoom. Needs to be used in combination
+         * with rightLon and topLat.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: filter
+         */
+        default WeatherEndpointConsumerBuilder zoom(String zoom) {
+            doSetProperty("zoom", zoom);
+            return this;
+        }
+        /**
+         * Domain for proxy NTLM authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default WeatherEndpointConsumerBuilder proxyAuthDomain(
+                String proxyAuthDomain) {
+            doSetProperty("proxyAuthDomain", proxyAuthDomain);
+            return this;
+        }
+        /**
+         * Optional host for proxy NTLM authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default WeatherEndpointConsumerBuilder proxyAuthHost(
+                String proxyAuthHost) {
+            doSetProperty("proxyAuthHost", proxyAuthHost);
+            return this;
+        }
+        /**
+         * Authentication method for proxy, either as Basic, Digest or NTLM.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default WeatherEndpointConsumerBuilder proxyAuthMethod(
+                String proxyAuthMethod) {
+            doSetProperty("proxyAuthMethod", proxyAuthMethod);
+            return this;
+        }
+        /**
+         * Password for proxy authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default WeatherEndpointConsumerBuilder proxyAuthPassword(
+                String proxyAuthPassword) {
+            doSetProperty("proxyAuthPassword", proxyAuthPassword);
+            return this;
+        }
+        /**
+         * Username for proxy authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default WeatherEndpointConsumerBuilder proxyAuthUsername(
+                String proxyAuthUsername) {
+            doSetProperty("proxyAuthUsername", proxyAuthUsername);
+            return this;
+        }
+        /**
+         * The proxy host name.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: proxy
+         */
+        default WeatherEndpointConsumerBuilder proxyHost(String proxyHost) {
+            doSetProperty("proxyHost", proxyHost);
+            return this;
+        }
+        /**
+         * The proxy port number.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: proxy
+         */
+        default WeatherEndpointConsumerBuilder proxyPort(Integer proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * The proxy port number.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: proxy
+         */
+        default WeatherEndpointConsumerBuilder proxyPort(String proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -630,251 +875,6 @@ public interface WeatherEndpointBuilderFactory {
             return this;
         }
         /**
-         * Number of results to be found.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder cnt(Integer cnt) {
-            doSetProperty("cnt", cnt);
-            return this;
-        }
-        /**
-         * Number of results to be found.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder cnt(String cnt) {
-            doSetProperty("cnt", cnt);
-            return this;
-        }
-        /**
-         * List of id's of city/stations. You can separate multiple ids by
-         * comma.
-         * 
-         * The option is a: <code>java.util.List&lt;java.lang.String&gt;</code>
-         * type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder ids(List<String> ids) {
-            doSetProperty("ids", ids);
-            return this;
-        }
-        /**
-         * List of id's of city/stations. You can separate multiple ids by
-         * comma.
-         * 
-         * The option will be converted to a
-         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder ids(String ids) {
-            doSetProperty("ids", ids);
-            return this;
-        }
-        /**
-         * Latitude of location. You can use lat and lon options instead of
-         * location. For boxed queries this is the bottom latitude.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder lat(String lat) {
-            doSetProperty("lat", lat);
-            return this;
-        }
-        /**
-         * If null Camel will try and determine your current location using the
-         * geolocation of your ip address, else specify the city,country. For
-         * well known city names, Open Weather Map will determine the best fit,
-         * but multiple results may be returned. Hence specifying and country as
-         * well will return more accurate data. If you specify current as the
-         * location then the component will try to get the current latitude and
-         * longitude and use that to get the weather details. You can use lat
-         * and lon options instead of location.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder location(String location) {
-            doSetProperty("location", location);
-            return this;
-        }
-        /**
-         * Longitude of location. You can use lat and lon options instead of
-         * location. For boxed queries this is the left longtitude.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder lon(String lon) {
-            doSetProperty("lon", lon);
-            return this;
-        }
-        /**
-         * For boxed queries this is the right longtitude. Needs to be used in
-         * combination with topLat and zoom.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder rightLon(String rightLon) {
-            doSetProperty("rightLon", rightLon);
-            return this;
-        }
-        /**
-         * For boxed queries this is the top latitude. Needs to be used in
-         * combination with rightLon and zoom.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder topLat(String topLat) {
-            doSetProperty("topLat", topLat);
-            return this;
-        }
-        /**
-         * Zip-code, e.g. 94040,us.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder zip(String zip) {
-            doSetProperty("zip", zip);
-            return this;
-        }
-        /**
-         * For boxed queries this is the zoom. Needs to be used in combination
-         * with rightLon and topLat.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder zoom(Integer zoom) {
-            doSetProperty("zoom", zoom);
-            return this;
-        }
-        /**
-         * For boxed queries this is the zoom. Needs to be used in combination
-         * with rightLon and topLat.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: filter
-         */
-        default WeatherEndpointConsumerBuilder zoom(String zoom) {
-            doSetProperty("zoom", zoom);
-            return this;
-        }
-        /**
-         * Domain for proxy NTLM authentication.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default WeatherEndpointConsumerBuilder proxyAuthDomain(
-                String proxyAuthDomain) {
-            doSetProperty("proxyAuthDomain", proxyAuthDomain);
-            return this;
-        }
-        /**
-         * Optional host for proxy NTLM authentication.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default WeatherEndpointConsumerBuilder proxyAuthHost(
-                String proxyAuthHost) {
-            doSetProperty("proxyAuthHost", proxyAuthHost);
-            return this;
-        }
-        /**
-         * Authentication method for proxy, either as Basic, Digest or NTLM.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default WeatherEndpointConsumerBuilder proxyAuthMethod(
-                String proxyAuthMethod) {
-            doSetProperty("proxyAuthMethod", proxyAuthMethod);
-            return this;
-        }
-        /**
-         * Password for proxy authentication.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default WeatherEndpointConsumerBuilder proxyAuthPassword(
-                String proxyAuthPassword) {
-            doSetProperty("proxyAuthPassword", proxyAuthPassword);
-            return this;
-        }
-        /**
-         * Username for proxy authentication.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default WeatherEndpointConsumerBuilder proxyAuthUsername(
-                String proxyAuthUsername) {
-            doSetProperty("proxyAuthUsername", proxyAuthUsername);
-            return this;
-        }
-        /**
-         * The proxy host name.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: proxy
-         */
-        default WeatherEndpointConsumerBuilder proxyHost(String proxyHost) {
-            doSetProperty("proxyHost", proxyHost);
-            return this;
-        }
-        /**
-         * The proxy port number.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Group: proxy
-         */
-        default WeatherEndpointConsumerBuilder proxyPort(Integer proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
-         * The proxy port number.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Group: proxy
-         */
-        default WeatherEndpointConsumerBuilder proxyPort(String proxyPort) {
-            doSetProperty("proxyPort", proxyPort);
-            return this;
-        }
-        /**
          * The geolocation service now needs an accessKey to be used.
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/docs/components/modules/ROOT/pages/activemq-component.adoc b/docs/components/modules/ROOT/pages/activemq-component.adoc
index a2e2832..498b82e 100644
--- a/docs/components/modules/ROOT/pages/activemq-component.adoc
+++ b/docs/components/modules/ROOT/pages/activemq-component.adoc
@@ -145,9 +145,9 @@ The ActiveMQ component supports 99 options, which are listed below.
 | *useMessageIDAsCorrelationID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
 | *waitForProvisionCorrelationTo BeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
 | *waitForProvisionCorrelationTo BeUpdatedThreadSleepingTime* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
+| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
-| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc b/docs/components/modules/ROOT/pages/amqp-component.adoc
index a248c9e..80374ce 100644
--- a/docs/components/modules/ROOT/pages/amqp-component.adoc
+++ b/docs/components/modules/ROOT/pages/amqp-component.adoc
@@ -134,9 +134,9 @@ The AMQP component supports 96 options, which are listed below.
 | *useMessageIDAsCorrelationID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
 | *waitForProvisionCorrelationTo BeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
 | *waitForProvisionCorrelationTo BeUpdatedThreadSleepingTime* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
+| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
-| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
diff --git a/docs/components/modules/ROOT/pages/aws-s3-component.adoc b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
index 99e4586..35547aa 100644
--- a/docs/components/modules/ROOT/pages/aws-s3-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-s3-component.adoc
@@ -77,12 +77,12 @@ The AWS S3 Storage Service component supports 37 options, which are listed below
 | *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. |  | String
 | *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled |  | String
 | *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
-| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *accelerateModeEnabled* ( advanced) | Define if Accelerate Mode enabled is true or false | false | boolean
 | *chunkedEncodingDisabled* ( advanced) | Define if disabled Chunked Encoding is true or false | false | boolean
 | *dualstackEnabled* ( advanced) | Define if Dualstack enabled is true or false | false | boolean
 | *forceGlobalBucketAccessEnabled* ( advanced) | Define if Force Global Bucket Access enabled is true or false | false | boolean
 | *payloadSigningEnabled* ( advanced) | Define if Payload Signing enabled is true or false | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
 |===
@@ -157,13 +157,13 @@ with the following path and query parameters:
 | *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. |  | String
 | *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled |  | String
 | *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
-| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accelerateModeEnabled* ( advanced) | Define if Accelerate Mode enabled is true or false | false | boolean
 | *chunkedEncodingDisabled* ( advanced) | Define if disabled Chunked Encoding is true or false | false | boolean
 | *dualstackEnabled* ( advanced) | Define if Dualstack enabled is true or false | false | boolean
 | *forceGlobalBucketAccessEnabled* ( advanced) | Define if Force Global Bucket Access enabled is true or false | false | boolean
 | *payloadSigningEnabled* ( advanced) | Define if Payload Signing enabled is true or false | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
diff --git a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
index 47ad01b..f985bb6 100644
--- a/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-sqs-component.adoc
@@ -147,6 +147,13 @@ with the following path and query parameters:
 | *delayQueue* (advanced) | Define if you want to apply delaySeconds option to the queue or on single messages | false | boolean
 | *queueUrl* (advanced) | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. |  | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *proxyHost* (proxy) | To define a proxy host when instantiating the SQS client |  | String
+| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client |  | Integer
+| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. |  | Integer
+| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. |  | Integer
+| *policy* (queue) | The policy for this queue |  | String
+| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. |  | Integer
+| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -161,13 +168,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *proxyHost* (proxy) | To define a proxy host when instantiating the SQS client |  | String
-| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client |  | Integer
-| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. |  | Integer
-| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. |  | Integer
-| *policy* (queue) | The policy for this queue |  | String
-| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. |  | Integer
-| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. |  | String
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
 |===
diff --git a/docs/components/modules/ROOT/pages/aws-swf-component.adoc b/docs/components/modules/ROOT/pages/aws-swf-component.adoc
index a9aa73e..07563d1 100644
--- a/docs/components/modules/ROOT/pages/aws-swf-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws-swf-component.adoc
@@ -47,15 +47,17 @@ The AWS Simple Workflow component supports 30 options, which are listed below.
 | *version* (common) | The workflow or activity event version to use. |  | String
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *clientConfigurationParameters* (advanced) | To configure the ClientConfiguration using the key/values from the Map. |  | Map
-| *startWorkflowOptionsParameters* (advanced) | To configure the StartWorkflowOptions using the key/values from the Map. |  | Map
-| *sWClientParameters* (advanced) | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. |  | Map
 | *activityList* (activity) | The list name to consume activities from. |  | String
 | *activitySchedulingOptions* (activity) | Activity scheduling options |  | ActivitySchedulingOptions
 | *activityThreadPoolSize* (activity) | Maximum number of threads in work pool for activity. | 100 | int
 | *activityTypeExecutionOptions* (activity) | Activity execution options |  | ActivityTypeExecutionOptions
 | *activityTypeRegistration Options* (activity) | Activity registration options |  | ActivityTypeRegistrationOptions
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+| *clientConfigurationParameters* (advanced) | To configure the ClientConfiguration using the key/values from the Map. |  | Map
+| *startWorkflowOptionsParameters* (advanced) | To configure the StartWorkflowOptions using the key/values from the Map. |  | Map
+| *sWClientParameters* (advanced) | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. |  | Map
+| *accessKey* (security) | Amazon AWS Access Key. |  | String
+| *secretKey* (security) | Amazon AWS Secret Key. |  | String
 | *childPolicy* (workflow) | The policy to use on child workflows when terminating a workflow. |  | String
 | *executionStartToCloseTimeout* (workflow) | Set the execution start to close timeout. | 3600 | String
 | *operation* (workflow) | Workflow operation. The value can be one of: SIGNAL, CANCEL, TERMINATE, GET_STATE, START, DESCRIBE, GET_HISTORY | START | String
@@ -66,8 +68,6 @@ The AWS Simple Workflow component supports 30 options, which are listed below.
 | *terminationReason* (workflow) | The reason for terminating a workflow. |  | String
 | *workflowList* (workflow) | The list name to consume workflows from. |  | String
 | *workflowTypeRegistration Options* (workflow) | Workflow registration options |  | WorkflowTypeRegistrationOptions
-| *accessKey* (security) | Amazon AWS Access Key. |  | String
-| *secretKey* (security) | Amazon AWS Secret Key. |  | String
 |===
 // component options: END
 
@@ -109,16 +109,18 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. The value can be one of: InOnly, InOut, InOptionalOut |  | ExchangePattern
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
-| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
-| *clientConfigurationParameters* (advanced) | To configure the ClientConfiguration using the key/values from the Map. |  | Map
-| *startWorkflowOptionsParameters* (advanced) | To configure the StartWorkflowOptions using the key/values from the Map. |  | Map
-| *sWClientParameters* (advanced) | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. |  | Map
-| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *activityList* (activity) | The list name to consume activities from. |  | String
 | *activitySchedulingOptions* (activity) | Activity scheduling options |  | ActivitySchedulingOptions
 | *activityThreadPoolSize* (activity) | Maximum number of threads in work pool for activity. | 100 | int
 | *activityTypeExecutionOptions* (activity) | Activity execution options |  | ActivityTypeExecutionOptions
 | *activityTypeRegistration Options* (activity) | Activity registration options |  | ActivityTypeRegistrationOptions
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+| *clientConfigurationParameters* (advanced) | To configure the ClientConfiguration using the key/values from the Map. |  | Map
+| *startWorkflowOptionsParameters* (advanced) | To configure the StartWorkflowOptions using the key/values from the Map. |  | Map
+| *sWClientParameters* (advanced) | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. |  | Map
+| *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *accessKey* (security) | Amazon AWS Access Key. |  | String
+| *secretKey* (security) | Amazon AWS Secret Key. |  | String
 | *childPolicy* (workflow) | The policy to use on child workflows when terminating a workflow. |  | String
 | *executionStartToCloseTimeout* (workflow) | Set the execution start to close timeout. | 3600 | String
 | *operation* (workflow) | Workflow operation. The value can be one of: SIGNAL, CANCEL, TERMINATE, GET_STATE, START, DESCRIBE, GET_HISTORY | START | String
@@ -129,8 +131,6 @@ with the following path and query parameters:
 | *terminationReason* (workflow) | The reason for terminating a workflow. |  | String
 | *workflowList* (workflow) | The list name to consume workflows from. |  | String
 | *workflowTypeRegistration Options* (workflow) | Workflow registration options |  | WorkflowTypeRegistrationOptions
-| *accessKey* (security) | Amazon AWS Access Key. |  | String
-| *secretKey* (security) | Amazon AWS Secret Key. |  | String
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
index 95e8e25..9efe1a6 100644
--- a/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
+++ b/docs/components/modules/ROOT/pages/aws2-sqs-component.adoc
@@ -152,6 +152,13 @@ with the following path and query parameters:
 | *delayQueue* (advanced) | Define if you want to apply delaySeconds option to the queue or on single messages | false | boolean
 | *queueUrl* (advanced) | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. |  | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *proxyHost* (proxy) | To define a proxy host when instantiating the SQS client |  | String
+| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client |  | Integer
+| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. |  | Integer
+| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. |  | Integer
+| *policy* (queue) | The policy for this queue |  | String
+| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. |  | Integer
+| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -166,13 +173,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *proxyHost* (proxy) | To define a proxy host when instantiating the SQS client |  | String
-| *proxyPort* (proxy) | To define a proxy port when instantiating the SQS client |  | Integer
-| *maximumMessageSize* (queue) | The maximumMessageSize (in bytes) an SQS message can contain for this queue. |  | Integer
-| *messageRetentionPeriod* (queue) | The messageRetentionPeriod (in seconds) a message will be retained by SQS for this queue. |  | Integer
-| *policy* (queue) | The policy for this queue |  | String
-| *receiveMessageWaitTimeSeconds* (queue) | If you do not specify WaitTimeSeconds in the request, the queue attribute ReceiveMessageWaitTimeSeconds is used to determine how long to wait. |  | Integer
-| *redrivePolicy* (queue) | Specify the policy that send message to DeadLetter queue. See detail at Amazon docs. |  | String
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
 |===
diff --git a/docs/components/modules/ROOT/pages/box-component.adoc b/docs/components/modules/ROOT/pages/box-component.adoc
index 5bc4285..4b35e93 100644
--- a/docs/components/modules/ROOT/pages/box-component.adoc
+++ b/docs/components/modules/ROOT/pages/box-component.adoc
@@ -68,11 +68,11 @@ The Box component supports 19 options, which are listed below.
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpParams* (advanced) | Custom HTTP params for settings like proxy host |  | Map
+| *authenticationType* (authentication) | The type of authentication for connection. Types of Authentication: STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION - OAuth 2.0 with JSON Web Tokens | APP_USER_AUTHENTICATION | String
 | *accessTokenCache* (security) | Custom Access Token Cache for storing and retrieving access tokens. |  | IAccessTokenCache
 | *clientSecret* (security) | Box application client secret |  | String
 | *encryptionAlgorithm* (security) | The type of encryption algorithm for JWT. Supported Algorithms: RSA_SHA_256 RSA_SHA_384 RSA_SHA_512. The value can be one of: RSA_SHA_256, RSA_SHA_384, RSA_SHA_512 | RSA_SHA_256 | EncryptionAlgorithm
 | *maxCacheEntries* (security) | The maximum number of access tokens in cache. | 100 | int
-| *authenticationType* (authentication) | The type of authentication for connection. Types of Authentication: STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION - OAuth 2.0 with JSON Web Tokens | APP_USER_AUTHENTICATION | String
 | *privateKeyFile* (security) | The private key for generating the JWT signature. |  | String
 | *privateKeyPassword* (security) | The password for the private key. |  | String
 | *publicKeyId* (security) | The ID for public key for validating the JWT signature. |  | String
@@ -121,25 +121,25 @@ with the following path and query parameters:
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpParams* (advanced) | Custom HTTP params for settings like proxy host |  | Map
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *accessTokenCache* (security) | Custom Access Token Cache for storing and retrieving access tokens. |  | IAccessTokenCache
+| *authenticationType* (authentication) | The type of authentication for connection. Types of Authentication: STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION - OAuth 2.0 with JSON Web Tokens | APP_USER_AUTHENTICATION | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
 | *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
 | *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
 | *repeatCount* (scheduler) | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0 | long
 | *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | TRACE | LoggingLevel
 | *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutorService
 | *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component. The value can be one of: none, spring, quartz | none | String
 | *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
+| *accessTokenCache* (security) | Custom Access Token Cache for storing and retrieving access tokens. |  | IAccessTokenCache
 | *clientSecret* (security) | Box application client secret |  | String
 | *encryptionAlgorithm* (security) | The type of encryption algorithm for JWT. Supported Algorithms: RSA_SHA_256 RSA_SHA_384 RSA_SHA_512. The value can be one of: RSA_SHA_256, RSA_SHA_384, RSA_SHA_512 | RSA_SHA_256 | EncryptionAlgorithm
 | *maxCacheEntries* (security) | The maximum number of access tokens in cache. | 100 | int
-| *authenticationType* (authentication) | The type of authentication for connection. Types of Authentication: STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged) SERVER_AUTHENTICATION - OAuth 2.0 with JSON Web Tokens | APP_USER_AUTHENTICATION | String
-| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
-| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *privateKeyFile* (security) | The private key for generating the JWT signature. |  | String
 | *privateKeyPassword* (security) | The password for the private key. |  | String
 | *publicKeyId* (security) | The ID for public key for validating the JWT signature. |  | String
diff --git a/docs/components/modules/ROOT/pages/braintree-component.adoc b/docs/components/modules/ROOT/pages/braintree-component.adoc
index 27a911f..540caa2 100644
--- a/docs/components/modules/ROOT/pages/braintree-component.adoc
+++ b/docs/components/modules/ROOT/pages/braintree-component.adoc
@@ -97,6 +97,11 @@ with the following path and query parameters:
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpReadTimeout* (advanced) | Set read timeout for http calls. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *httpLogLevel* (logging) | Set logging level for http calls, see java.util.logging.Level |  | String
+| *httpLogName* (logging) | Set log category to use to log http calls. | Braintree | String
+| *logHandlerEnabled* (logging) | Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an existing JUL - SLF4J logger bridge is on the classpath. This option can also be configured globally on the BraintreeComponent. | true | boolean
+| *proxyHost* (proxy) | The proxy host |  | String
+| *proxyPort* (proxy) | The proxy port |  | Integer
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -111,11 +116,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *httpLogLevel* (logging) | Set logging level for http calls, see java.util.logging.Level |  | String
-| *httpLogName* (logging) | Set log category to use to log http calls. | Braintree | String
-| *logHandlerEnabled* (logging) | Sets whether to enable the BraintreeLogHandler. It may be desirable to set this to 'false' where an existing JUL - SLF4J logger bridge is on the classpath. This option can also be configured globally on the BraintreeComponent. | true | boolean
-| *proxyHost* (proxy) | The proxy host |  | String
-| *proxyPort* (proxy) | The proxy port |  | Integer
 | *accessToken* (security) | The access token granted by a merchant to another in order to process transactions on their behalf. Used in place of environment, merchant id, public key and private key fields. |  | String
 | *privateKey* (security) | The private key provided by Braintree. |  | String
 | *publicKey* (security) | The public key provided by Braintree. |  | String
diff --git a/docs/components/modules/ROOT/pages/consul-component.adoc b/docs/components/modules/ROOT/pages/consul-component.adoc
index 4155b58..959451e 100644
--- a/docs/components/modules/ROOT/pages/consul-component.adoc
+++ b/docs/components/modules/ROOT/pages/consul-component.adoc
@@ -66,14 +66,14 @@ The Consul component supports 26 options, which are listed below.
 | *datacenter* (advanced) | The data center |  | String
 | *nearNode* (advanced) | The near node to use for queries. |  | String
 | *nodeMeta* (advanced) | The note meta-data to use for queries. |  | List
-| *blockSeconds* (watch) | The second to wait for a watch event, default 10 seconds | 10 | Integer
-| *firstIndex* (watch) | The first index for watch for, default 0 | 0 | BigInteger
-| *recursive* (watch) | Recursively watch, default false | false | boolean
 | *aclToken* (security) | Sets the ACL token to be used with Consul |  | String
 | *password* (security) | Sets the password to be used for basic authentication |  | String
 | *sslContextParameters* (security) | SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters instance. |  | SSLContextParameters
 | *useGlobalSslContextParameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *userName* (security) | Sets the username to be used for basic authentication |  | String
+| *blockSeconds* (watch) | The second to wait for a watch event, default 10 seconds | 10 | Integer
+| *firstIndex* (watch) | The first index for watch for, default 0 | 0 | BigInteger
+| *recursive* (watch) | Recursively watch, default false | false | boolean
 |===
 // component options: END
 
@@ -127,13 +127,13 @@ with the following path and query parameters:
 | *nearNode* (advanced) | The near node to use for queries. |  | String
 | *nodeMeta* (advanced) | The note meta-data to use for queries. |  | List
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *blockSeconds* (watch) | The second to wait for a watch event, default 10 seconds | 10 | Integer
-| *firstIndex* (watch) | The first index for watch for, default 0 | 0 | BigInteger
-| *recursive* (watch) | Recursively watch, default false | false | boolean
 | *aclToken* (security) | Sets the ACL token to be used with Consul |  | String
 | *password* (security) | Sets the password to be used for basic authentication |  | String
 | *sslContextParameters* (security) | SSL configuration using an org.apache.camel.support.jsse.SSLContextParameters instance. |  | SSLContextParameters
 | *userName* (security) | Sets the username to be used for basic authentication |  | String
+| *blockSeconds* (watch) | The second to wait for a watch event, default 10 seconds | 10 | Integer
+| *firstIndex* (watch) | The first index for watch for, default 0 | 0 | BigInteger
+| *recursive* (watch) | Recursively watch, default false | false | boolean
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/elytron-component.adoc b/docs/components/modules/ROOT/pages/elytron-component.adoc
index d041cc8..6d82d74 100644
--- a/docs/components/modules/ROOT/pages/elytron-component.adoc
+++ b/docs/components/modules/ROOT/pages/elytron-component.adoc
@@ -122,10 +122,10 @@ with the following path and query parameters:
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *undertowHttpBinding* (advanced) | To use a custom UndertowHttpBinding to control the mapping between Camel message and undertow. |  | UndertowHttpBinding
+| *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 | *fireWebSocketChannelEvents* (websocket) | if true, the consumer will post notifications to the route when a new WebSocket peer connects, disconnects, etc. See UndertowConstants.EVENT_TYPE and EventType. | false | boolean
 | *sendTimeout* (websocket) | Timeout in milliseconds when sending to a websocket channel. The default timeout is 30000 (30 seconds). | 30000 | Integer
 | *sendToAll* (websocket) | To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the UndertowConstants.SEND_TO_ALL header on the message. |  | Boolean
-| *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/fhir-component.adoc b/docs/components/modules/ROOT/pages/fhir-component.adoc
index fd2d371..ad95952 100644
--- a/docs/components/modules/ROOT/pages/fhir-component.adoc
+++ b/docs/components/modules/ROOT/pages/fhir-component.adoc
@@ -141,6 +141,10 @@ with the following path and query parameters:
 | *summary* (advanced) | Request that the server modify the response using the _summary param. The value can be one of: COUNT, TEXT, DATA, TRUE, FALSE |  | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *validationMode* (advanced) | When should Camel validate the FHIR Server's conformance statement. The value can be one of: NEVER, ONCE | ONCE | String
+| *proxyHost* (proxy) | The proxy host |  | String
+| *proxyPassword* (proxy) | The proxy password |  | String
+| *proxyPort* (proxy) | The proxy port |  | Integer
+| *proxyUser* (proxy) | The proxy username |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -155,10 +159,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *proxyHost* (proxy) | The proxy host |  | String
-| *proxyPassword* (proxy) | The proxy password |  | String
-| *proxyPort* (proxy) | The proxy port |  | Integer
-| *proxyUser* (proxy) | The proxy username |  | String
 | *accessToken* (security) | OAuth access token |  | String
 | *password* (security) | Username to use for basic authentication |  | String
 | *username* (security) | Username to use for basic authentication |  | String
diff --git a/docs/components/modules/ROOT/pages/ftp-component.adoc b/docs/components/modules/ROOT/pages/ftp-component.adoc
index fd2a819..2b31a7d 100644
--- a/docs/components/modules/ROOT/pages/ftp-component.adoc
+++ b/docs/components/modules/ROOT/pages/ftp-component.adoc
@@ -218,12 +218,12 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
-| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
-| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 | *account* (security) | Account to use for login |  | String
 | *password* (security) | Password to use for login |  | String
 | *username* (security) | Username to use for login |  | String
+| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
+| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
+| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/ftps-component.adoc b/docs/components/modules/ROOT/pages/ftps-component.adoc
index 3129ced..02fcd7b 100644
--- a/docs/components/modules/ROOT/pages/ftps-component.adoc
+++ b/docs/components/modules/ROOT/pages/ftps-component.adoc
@@ -177,9 +177,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
-| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
-| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 | *account* (security) | Account to use for login |  | String
 | *disableSecureDataChannel Defaults* (security) | Use this option to disable default options when using secure data channel. This allows you to be in full control what the execPbsz and execProt setting should be used. Default is false | false | boolean
 | *execPbsz* (security) | When using secure data channel you can set the exec protection buffer size |  | Long
@@ -191,6 +188,9 @@ with the following path and query parameters:
 | *securityProtocol* (security) | Set the underlying security protocol. | TLSv1.2 | String
 | *sslContextParameters* (security) | Gets the JSSE configuration that overrides any settings in FtpsEndpoint#\ftpClientKeyStoreParameters, \ftpClientTrustStoreParameters, and FtpsConfiguration#getSecurityProtocol(). |  | SSLContextParameters
 | *username* (security) | Username to use for login |  | String
+| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
+| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
+| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index d9baa1c..851e4e2 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -268,7 +268,7 @@ Number of Components: 331 in 264 JAR artifacts (1 deprecated)
 
 | xref:google-mail-stream-component.adoc[Google Mail Stream] (camel-google-mail) | 2.22 | The google-mail component provides access to Google Mail.
 
-| xref:google-pubsub-component.adoc[Google Pubsub] (camel-google-pubsub) | 2.19 | Messaging client for Google Cloud Platform PubSub Service
+| xref:google-pubsub-component.adoc[Google Pubsub] (camel-google-pubsub) | 2.19 | Messaging client for Google Cloud Platform PubSub Service Built on top of the Google Cloud Pub/Sub libraries.
 
 | xref:google-sheets-component.adoc[Google Sheets] (camel-google-sheets) | 2.23 | The google-sheets component provides access to Google Sheets.
 
diff --git a/docs/components/modules/ROOT/pages/jms-component.adoc b/docs/components/modules/ROOT/pages/jms-component.adoc
index 7552e23..18decfe 100644
--- a/docs/components/modules/ROOT/pages/jms-component.adoc
+++ b/docs/components/modules/ROOT/pages/jms-component.adoc
@@ -275,9 +275,9 @@ The JMS component supports 95 options, which are listed below.
 | *useMessageIDAsCorrelationID* (advanced) | Specifies whether JMSMessageID should always be used as JMSCorrelationID for InOut messages. | false | boolean
 | *waitForProvisionCorrelationTo BeUpdatedCounter* (advanced) | Number of times to wait for provisional correlation id to be updated to the actual correlation id when doing request/reply over JMS and when the option useMessageIDAsCorrelationID is enabled. | 50 | int
 | *waitForProvisionCorrelationTo BeUpdatedThreadSleepingTime* (advanced) | Interval in millis to sleep each time while waiting for provisional correlation id to be updated. | 100 | long
+| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *errorHandlerLoggingLevel* (logging) | Allows to configure the default errorHandler logging level for logging uncaught exceptions. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | WARN | LoggingLevel
 | *errorHandlerLogStackTrace* (logging) | Allows to control whether stacktraces should be logged or not, by the default errorHandler. | true | boolean
-| *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *password* (security) | Password to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *username* (security) | Username to use with the ConnectionFactory. You can also configure username/password directly on the ConnectionFactory. |  | String
 | *transacted* (transaction) | Specifies whether to use transacted mode | false | boolean
diff --git a/docs/components/modules/ROOT/pages/jmx-component.adoc b/docs/components/modules/ROOT/pages/jmx-component.adoc
index 9be9d22..8500096 100644
--- a/docs/components/modules/ROOT/pages/jmx-component.adoc
+++ b/docs/components/modules/ROOT/pages/jmx-component.adoc
@@ -74,9 +74,6 @@ with the following path and query parameters:
 | *reconnectOnConnectionFailure* (advanced) | If true the consumer will attempt to reconnect to the JMX server when any connection failure occurs. The consumer will attempt to re-establish the JMX connection every 'x' seconds until the connection is made-- where 'x' is the configured reconnectionDelay | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *testConnectionOnStartup* (advanced) | If true the consumer will throw an exception if unable to establish the JMX connection upon startup. If false, the consumer will attempt to establish the JMX connection every 'x' seconds until the connection is made -- where 'x' is the configured reconnectionDelay | true | boolean
-| *notifyDiffer* (string) | If true, will fire a notification when the string attribute differs from the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. | false | boolean
-| *notifyMatch* (string) | If true, will fire a notification when the string attribute matches the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. | false | boolean
-| *stringToCompare* (string) | Value for attribute to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. |  | String
 | *initThreshold* (counter) | Initial threshold for the monitor. The value must exceed this before notifications are fired (counter monitor only). |  | int
 | *modulus* (counter) | The value at which the counter is reset to zero (counter monitor only). |  | int
 | *offset* (counter) | The amount to increment the threshold after it's been exceeded (counter monitor only). |  | int
@@ -87,6 +84,9 @@ with the following path and query parameters:
 | *thresholdLow* (gauge) | Value for the gauge's low threshold (gauge monitor only). |  | Double
 | *password* (security) | Credentials for making a remote connection |  | String
 | *user* (security) | Credentials for making a remote connection |  | String
+| *notifyDiffer* (string) | If true, will fire a notification when the string attribute differs from the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. | false | boolean
+| *notifyMatch* (string) | If true, will fire a notification when the string attribute matches the string to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. | false | boolean
+| *stringToCompare* (string) | Value for attribute to compare (string monitor or consumer). By default the consumer will notify match if observed attribute and string to compare has been configured. |  | String
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/mail-component.adoc b/docs/components/modules/ROOT/pages/mail-component.adoc
index e9b404a..0d01ede 100644
--- a/docs/components/modules/ROOT/pages/mail-component.adoc
+++ b/docs/components/modules/ROOT/pages/mail-component.adoc
@@ -238,10 +238,10 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *sortTerm* (sort) | Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability. |  | SortTerm[]
 | *password* (security) | The password for login |  | String
 | *sslContextParameters* (security) | To configure security using SSLContextParameters. |  | SSLContextParameters
 | *username* (security) | The username for login |  | String
+| *sortTerm* (sort) | Sorting order for messages. Only natively supported for IMAP. Emulated to some degree when using POP3 or when IMAP server does not have the SORT capability. |  | SortTerm[]
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/mllp-component.adoc b/docs/components/modules/ROOT/pages/mllp-component.adoc
index e00ac22..baeb3d3 100644
--- a/docs/components/modules/ROOT/pages/mllp-component.adoc
+++ b/docs/components/modules/ROOT/pages/mllp-component.adoc
@@ -107,23 +107,23 @@ with the following path and query parameters:
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used (this component only supports synchronous operations). | true | boolean
+| *charsetName* (codec) | Set the CamelCharsetName property on the exchange |  | String
 | *backlog* (tcp) | The maximum queue length for incoming connection indications (a request to connect) is set to the backlog parameter. If a connection indication arrives when the queue is full, the connection is refused. | 5 | Integer
+| *keepAlive* (tcp) | Enable/disable the SO_KEEPALIVE socket option. | true | Boolean
 | *lenientBind* (tcp) | TCP Server Only - Allow the endpoint to start before the TCP ServerSocket is bound. In some environments, it may be desirable to allow the endpoint to start before the TCP ServerSocket is bound. | false | boolean
 | *maxConcurrentConsumers* (tcp) | The maximum number of concurrent MLLP Consumer connections that will be allowed. If a new connection is received and the maximum is number are already established, the new connection will be reset immediately. | 5 | int
+| *receiveBufferSize* (tcp) | Sets the SO_RCVBUF option to the specified value (in bytes) | 8192 | Integer
 | *reuseAddress* (tcp) | Enable/disable the SO_REUSEADDR socket option. | false | Boolean
+| *sendBufferSize* (tcp) | Sets the SO_SNDBUF option to the specified value (in bytes) | 8192 | Integer
+| *tcpNoDelay* (tcp) | Enable/disable the TCP_NODELAY socket option. | true | Boolean
 | *acceptTimeout* (timeout) | Timeout (in milliseconds) while waiting for a TCP connection TCP Server Only | 60000 | int
 | *bindRetryInterval* (timeout) | TCP Server Only - The number of milliseconds to wait between bind attempts | 5000 | int
 | *bindTimeout* (timeout) | TCP Server Only - The number of milliseconds to retry binding to a server port | 30000 | int
-| *keepAlive* (tcp) | Enable/disable the SO_KEEPALIVE socket option. | true | Boolean
-| *sendBufferSize* (tcp) | Sets the SO_SNDBUF option to the specified value (in bytes) | 8192 | Integer
-| *tcpNoDelay* (tcp) | Enable/disable the TCP_NODELAY socket option. | true | Boolean
 | *connectTimeout* (timeout) | Timeout (in milliseconds) for establishing for a TCP connection TCP Client only | 30000 | int
 | *idleTimeout* (timeout) | The approximate idle time allowed before the Client TCP Connection will be reset. A null value or a value less than or equal to zero will disable the idle timeout. |  | Integer
 | *maxReceiveTimeouts* (timeout) | *Deprecated* The maximum number of timeouts (specified by receiveTimeout) allowed before the TCP Connection will be reset. |  | Integer
-| *receiveBufferSize* (tcp) | Sets the SO_RCVBUF option to the specified value (in bytes) | 8192 | Integer
 | *readTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used after the start of an MLLP frame has been received | 5000 | int
 | *receiveTimeout* (timeout) | The SO_TIMEOUT value (in milliseconds) used when waiting for the start of an MLLP frame | 15000 | int
-| *charsetName* (codec) | Set the CamelCharsetName property on the exchange |  | String
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/sftp-component.adoc b/docs/components/modules/ROOT/pages/sftp-component.adoc
index 1aa541a..5bfeba8 100644
--- a/docs/components/modules/ROOT/pages/sftp-component.adoc
+++ b/docs/components/modules/ROOT/pages/sftp-component.adoc
@@ -175,9 +175,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
-| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
-| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 | *ciphers* (security) | Set a comma separated list of ciphers that will be used in order of preference. Possible cipher names are defined by JCraft JSCH. Some examples include: aes128-ctr,aes128-cbc,3des-ctr,3des-cbc,blowfish-cbc,aes192-cbc,aes256-cbc. If not specified the default list from JSCH will be used. |  | String
 | *keyPair* (security) | Sets a key pair of the public and private key so to that the SFTP endpoint can do public/private key verification. |  | KeyPair
 | *knownHosts* (security) | Sets the known_hosts from the byte array, so that the SFTP endpoint can do host key verification. |  | byte[]
@@ -192,6 +189,9 @@ with the following path and query parameters:
 | *strictHostKeyChecking* (security) | Sets whether to use strict host key checking. The value can be one of: no, yes | no | String
 | *username* (security) | Username to use for login |  | String
 | *useUserKnownHostsFile* (security) | If knownHostFile has not been explicit configured then use the host file from System.getProperty(user.home)/.ssh/known_hosts | true | boolean
+| *shuffle* (sort) | To shuffle the list of files (sort in random order) | false | boolean
+| *sortBy* (sort) | Built-in sort by using the File Language. Supports nested sorts, so you can have a sort by file name and as a 2nd group sort by modified date. |  | String
+| *sorter* (sort) | Pluggable sorter as a java.util.Comparator class. |  | Comparator
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/telegram-component.adoc b/docs/components/modules/ROOT/pages/telegram-component.adoc
index b039fb2..82ed22e 100644
--- a/docs/components/modules/ROOT/pages/telegram-component.adoc
+++ b/docs/components/modules/ROOT/pages/telegram-component.adoc
@@ -110,6 +110,8 @@ with the following path and query parameters:
 | *bufferSize* (advanced) | The initial in-memory buffer size used when transferring data between Camel and AHC Client. | 4096 | int
 | *clientConfig* (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. |  | AsyncHttpClientConfig
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *proxyHost* (proxy) | HTTP proxy host which could be used when sending out the message. |  | String
+| *proxyPort* (proxy) | HTTP proxy port which could be used when sending out the message. |  | Integer
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -124,8 +126,6 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *proxyHost* (proxy) | HTTP proxy host which could be used when sending out the message. |  | String
-| *proxyPort* (proxy) | HTTP proxy port which could be used when sending out the message. |  | Integer
 | *authorizationToken* (security) | *Required* The authorization token for using the bot (ask the BotFather) |  | String
 |===
 // endpoint options: END
diff --git a/docs/components/modules/ROOT/pages/twitter-directmessage-component.adoc b/docs/components/modules/ROOT/pages/twitter-directmessage-component.adoc
index 43719a0..e2a263a 100644
--- a/docs/components/modules/ROOT/pages/twitter-directmessage-component.adoc
+++ b/docs/components/modules/ROOT/pages/twitter-directmessage-component.adoc
@@ -83,6 +83,10 @@ with the following path and query parameters:
 | *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
 | *sinceId* (filter) | The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running. | 1 | long
 | *userIds* (filter) | To filter by user ids for filter. Multiple values can be separated by comma. |  | String
+| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
+| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -97,15 +101,11 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
-| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
-| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessToken* (security) | The access token. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessTokenSecret* (security) | The access secret. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerKey* (security) | The consumer key. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerSecret* (security) | The consumer secret. Can also be configured on the TwitterComponent level instead. |  | String
+| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/twitter-search-component.adoc b/docs/components/modules/ROOT/pages/twitter-search-component.adoc
index 86f9e83..eee7b0d 100644
--- a/docs/components/modules/ROOT/pages/twitter-search-component.adoc
+++ b/docs/components/modules/ROOT/pages/twitter-search-component.adoc
@@ -92,6 +92,10 @@ with the following path and query parameters:
 | *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
 | *sinceId* (filter) | The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running. | 1 | long
 | *userIds* (filter) | To filter by user ids for filter. Multiple values can be separated by comma. |  | String
+| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
+| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -106,15 +110,11 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
-| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
-| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessToken* (security) | The access token. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessTokenSecret* (security) | The access secret. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerKey* (security) | The consumer key. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerSecret* (security) | The consumer secret. Can also be configured on the TwitterComponent level instead. |  | String
+| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/twitter-timeline-component.adoc b/docs/components/modules/ROOT/pages/twitter-timeline-component.adoc
index 2c63dda..cf4f6a1 100644
--- a/docs/components/modules/ROOT/pages/twitter-timeline-component.adoc
+++ b/docs/components/modules/ROOT/pages/twitter-timeline-component.adoc
@@ -84,6 +84,10 @@ with the following path and query parameters:
 | *numberOfPages* (filter) | The number of pages result which you want camel-twitter to consume. | 1 | Integer
 | *sinceId* (filter) | The last tweet id which will be used for pulling the tweets. It is useful when the camel route is restarted after a long running. | 1 | long
 | *userIds* (filter) | To filter by user ids for filter. Multiple values can be separated by comma. |  | String
+| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
+| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
+| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
@@ -98,15 +102,11 @@ with the following path and query parameters:
 | *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
 | *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
 | *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
-| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
-| *httpProxyHost* (proxy) | The http proxy host which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPassword* (proxy) | The http proxy password which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
-| *httpProxyPort* (proxy) | The http proxy port which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | Integer
-| *httpProxyUser* (proxy) | The http proxy user which can be used for the camel-twitter. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessToken* (security) | The access token. Can also be configured on the TwitterComponent level instead. |  | String
 | *accessTokenSecret* (security) | The access secret. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerKey* (security) | The consumer key. Can also be configured on the TwitterComponent level instead. |  | String
 | *consumerSecret* (security) | The consumer secret. Can also be configured on the TwitterComponent level instead. |  | String
+| *sortById* (sort) | Sorts by id, so the oldest are first, and newest last. | true | boolean
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/undertow-component.adoc b/docs/components/modules/ROOT/pages/undertow-component.adoc
index ab3507f..014f64a 100644
--- a/docs/components/modules/ROOT/pages/undertow-component.adoc
+++ b/docs/components/modules/ROOT/pages/undertow-component.adoc
@@ -116,10 +116,10 @@ with the following path and query parameters:
 | *headerFilterStrategy* (advanced) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *undertowHttpBinding* (advanced) | To use a custom UndertowHttpBinding to control the mapping between Camel message and undertow. |  | UndertowHttpBinding
+| *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 | *fireWebSocketChannelEvents* (websocket) | if true, the consumer will post notifications to the route when a new WebSocket peer connects, disconnects, etc. See UndertowConstants.EVENT_TYPE and EventType. | false | boolean
 | *sendTimeout* (websocket) | Timeout in milliseconds when sending to a websocket channel. The default timeout is 30000 (30 seconds). | 30000 | Integer
 | *sendToAll* (websocket) | To send to all websocket subscribers. Can be used to configure on endpoint level, instead of having to use the UndertowConstants.SEND_TO_ALL header on the message. |  | Boolean
-| *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 |===
 // endpoint options: END
 
diff --git a/docs/components/modules/ROOT/pages/weather-component.adoc b/docs/components/modules/ROOT/pages/weather-component.adoc
index 23bdd80..4a0ff66 100644
--- a/docs/components/modules/ROOT/pages/weather-component.adoc
+++ b/docs/components/modules/ROOT/pages/weather-component.adoc
@@ -111,20 +111,6 @@ with the following path and query parameters:
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpConnectionManager* (advanced) | To use a custom HttpConnectionManager to manage connections |  | HttpConnectionManager
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
-| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
-| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
-| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
-| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
-| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
-| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
-| *repeatCount* (scheduler) | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0 | long
-| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | TRACE | LoggingLevel
-| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutorService
-| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component. The value can be one of: none, spring, quartz | none | String
-| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
-| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
-| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
-| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *cnt* (filter) | Number of results to be found |  | Integer
 | *ids* (filter) | List of id's of city/stations. You can separate multiple ids by comma. |  | String
 | *lat* (filter) | Latitude of location. You can use lat and lon options instead of location. For boxed queries this is the bottom latitude. |  | String
@@ -141,6 +127,20 @@ with the following path and query parameters:
 | *proxyAuthUsername* (proxy) | Username for proxy authentication |  | String
 | *proxyHost* (proxy) | The proxy host name |  | String
 | *proxyPort* (proxy) | The proxy port number |  | Integer
+| *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
+| *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
+| *backoffMultiplier* (scheduler) | To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured. |  | int
+| *delay* (scheduler) | Milliseconds before the next poll. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 500 | long
+| *greedy* (scheduler) | If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages. | false | boolean
+| *initialDelay* (scheduler) | Milliseconds before the first poll starts. You can also specify time values using units, such as 60s (60 seconds), 5m30s (5 minutes and 30 seconds), and 1h (1 hour). | 1000 | long
+| *repeatCount* (scheduler) | Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever. | 0 | long
+| *runLoggingLevel* (scheduler) | The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that. The value can be one of: TRACE, DEBUG, INFO, WARN, ERROR, OFF | TRACE | LoggingLevel
+| *scheduledExecutorService* (scheduler) | Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool. |  | ScheduledExecutorService
+| *scheduler* (scheduler) | To use a cron scheduler from either camel-spring or camel-quartz component. The value can be one of: none, spring, quartz | none | String
+| *schedulerProperties* (scheduler) | To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler. |  | Map
+| *startScheduler* (scheduler) | Whether the scheduler should be auto started. | true | boolean
+| *timeUnit* (scheduler) | Time unit for initialDelay and delay options. The value can be one of: NANOSECONDS, MICROSECONDS, MILLISECONDS, SECONDS, MINUTES, HOURS, DAYS | MILLISECONDS | TimeUnit
+| *useFixedDelay* (scheduler) | Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details. | true | boolean
 | *geolocationAccessKey* (security) | *Required* The geolocation service now needs an accessKey to be used |  | String
 | *geolocationRequestHostIP* (security) | *Required* The geolocation service now needs to specify the IP associated to the accessKey you're using |  | String
 |===
diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc b/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
index dd39620..74ca1a1 100644
--- a/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
+++ b/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
@@ -247,12 +247,12 @@ The XML Security Verify component supports 19 options, which are listed below.
 | *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keySelector* (producer) | Provides the key for validating the XML signature. |  | KeySelector
 | *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
-| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *outputNodeSearch* (producer) | Sets the output node search value for determining the node from the XML signature document which shall be set to the output message body. The class of the value depends on the type of the output node search. The output node search is forwarded to XmlSignature2Message. |  | Object
 | *outputNodeSearchType* (producer) | Determines the search type for determining the output node which is serialized into the output message bodyF. See setOutputNodeSearch(Object). The supported default search types you can find in DefaultXmlSignature2Message. | Default | String
 | *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *removeSignatureElements* (producer) | Indicator whether the XML signature elements (elements with local name Signature and namesapce \http://www.w3.org/2000/09/xmldsig#) shall be removed from the document set to the output message. Normally, this is only necessary, if the XML signature is enveloped. The default value is Boolean#FALSE. This parameter is forwarded to XmlSignature2Message. This indicator has no effect if the output node search is of type DefaultXmlSignature2Message#OUTPU [...]
 | *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
+| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *secureValidation* (producer) | Enables secure validation. If true then secure validation is enabled. | true | Boolean
 | *validationFailedHandler* (producer) | Handles the different validation failed situations. The default implementation throws specific exceptions for the different situations (All exceptions have the package name org.apache.camel.component.xmlsecurity.api and are a sub-class of XmlSignatureInvalidException. If the signature value validation fails, a XmlSignatureInvalidValueException is thrown. If a reference validation fails, a XmlSignatureInvalidContentHashException is thrown. For more [...]
 | *xmlSignature2Message* (producer) | Bean which maps the XML signature to the output-message after the validation. How this mapping should be done can be configured by the options outputNodeSearchType, outputNodeSearch, and removeSignatureElements. The default implementation offers three possibilities which are related to the three output node search types Default, ElementName, and XPath. The default implementation determines a node which is then serialized and set to the body of the ou [...]


[camel] 15/18: Sort the endpoints correctly in case there is an parent/child relationship

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

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

commit ee0b6002e4bd046a5ed8e3a27ee7b40d64efb322
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 22:42:11 2020 +0100

    Sort the endpoints correctly in case there is an parent/child relationship
---
 .../packaging/EndpointSchemaGeneratorMojo.java     | 67 +++++++++++++---------
 1 file changed, 41 insertions(+), 26 deletions(-)

diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
index 9728de1..9745755 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointSchemaGeneratorMojo.java
@@ -122,39 +122,54 @@ public class EndpointSchemaGeneratorMojo extends AbstractGeneratorMojo {
             return;
         }
 
+        List<Class<?>> classes = new ArrayList<>();
         for (AnnotationInstance ai : getIndex().getAnnotations(URI_ENDPOINT)) {
-
             Class<?> classElement = loadClass(ai.target().asClass().name().toString());
             final UriEndpoint uriEndpoint = classElement.getAnnotation(UriEndpoint.class);
             if (uriEndpoint != null) {
                 String scheme = uriEndpoint.scheme();
-                String extendsScheme = uriEndpoint.extendsScheme();
-                String title = uriEndpoint.title();
-                final String label = uriEndpoint.label();
-                validateSchemaName(scheme, classElement);
                 if (!Strings.isNullOrEmpty(scheme)) {
-                    // support multiple schemes separated by comma, which maps to
-                    // the exact same component
-                    // for example camel-mail has a bunch of component schema names
-                    // that does that
-                    String[] schemes = scheme.split(",");
-                    String[] titles = title.split(",");
-                    String[] extendsSchemes = extendsScheme.split(",");
-                    for (int i = 0; i < schemes.length; i++) {
-                        final String alias = schemes[i];
-                        final String extendsAlias = i < extendsSchemes.length ? extendsSchemes[i] : extendsSchemes[0];
-                        String aTitle = i < titles.length ? titles[i] : titles[0];
-
-                        // some components offer a secure alternative which we need
-                        // to amend the title accordingly
-                        if (secureAlias(schemes[0], alias)) {
-                            aTitle += " (Secure)";
-                        }
-                        final String aliasTitle = aTitle;
-
-                        writeJSonSchemeAndPropertyConfigurer(classElement, uriEndpoint, aliasTitle, alias, extendsAlias, label, schemes);
-                    }
+                    classes.add(classElement);
+                }
+            }
+        }
+        // make sure we sort the classes in case one inherit from the other
+        classes.sort((c1, c2) -> {
+            if (c1.isAssignableFrom(c2)) {
+                return -1;
+            } else if (c2.isAssignableFrom(c1)) {
+                return +1;
+            } else {
+                return c1.getName().compareTo(c2.getName());
+            }
+        });
+        for (Class<?> classElement : classes) {
+            UriEndpoint uriEndpoint = classElement.getAnnotation(UriEndpoint.class);
+            String scheme = uriEndpoint.scheme();
+            String extendsScheme = uriEndpoint.extendsScheme();
+            String title = uriEndpoint.title();
+            final String label = uriEndpoint.label();
+            validateSchemaName(scheme, classElement);
+            // support multiple schemes separated by comma, which maps to
+            // the exact same component
+            // for example camel-mail has a bunch of component schema names
+            // that does that
+            String[] schemes = scheme.split(",");
+            String[] titles = title.split(",");
+            String[] extendsSchemes = extendsScheme.split(",");
+            for (int i = 0; i < schemes.length; i++) {
+                final String alias = schemes[i];
+                final String extendsAlias = i < extendsSchemes.length ? extendsSchemes[i] : extendsSchemes[0];
+                String aTitle = i < titles.length ? titles[i] : titles[0];
+
+                // some components offer a secure alternative which we need
+                // to amend the title accordingly
+                if (secureAlias(schemes[0], alias)) {
+                    aTitle += " (Secure)";
                 }
+                final String aliasTitle = aTitle;
+
+                writeJSonSchemeAndPropertyConfigurer(classElement, uriEndpoint, aliasTitle, alias, extendsAlias, label, schemes);
             }
         }
     }


[camel] 13/18: Fix kafka component doc and regen

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

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

commit 8378eecdda7999f5936c22f569ad300bc311b426
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 21:33:04 2020 +0100

    Fix kafka component doc and regen
---
 .../org/apache/camel/component/kafka/kafka.json    |  12 +--
 .../camel-kafka/src/main/docs/kafka-component.adoc |  10 +-
 .../dsl/KafkaComponentBuilderFactory.java          |  58 +++++------
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  | 106 ++++++++++-----------
 .../modules/ROOT/pages/kafka-component.adoc        |  10 +-
 .../camel/maven/packaging/EndpointHelper.java      |   9 +-
 .../camel/maven/packaging/EndpointHelperTest.java  |  47 +++++++++
 .../src/test/resources/json/test_component3.json   |  31 ++++++
 8 files changed, 182 insertions(+), 101 deletions(-)

diff --git a/components/camel-kafka/src/generated/resources/org/apache/camel/component/kafka/kafka.json b/components/camel-kafka/src/generated/resources/org/apache/camel/component/kafka/kafka.json
index 9b0590e..abe01da 100644
--- a/components/camel-kafka/src/generated/resources/org/apache/camel/component/kafka/kafka.json
+++ b/components/camel-kafka/src/generated/resources/org/apache/camel/component/kafka/kafka.json
@@ -88,6 +88,7 @@
     "workerPoolCoreSize": { "kind": "property", "displayName": "Worker Pool Core Size", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "10", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Number of core threads for the worker pool for continue routing Exchange after kafka server has ack [...]
     "workerPoolMaxSize": { "kind": "property", "displayName": "Worker Pool Max Size", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "20", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Maximum number of threads for the worker pool for continue routing Exchange after kafka server has ac [...]
     "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
+    "schemaRegistryURL": { "kind": "property", "displayName": "Schema Registry URL", "group": "confluent", "label": "confluent", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema [...]
     "interceptorClasses": { "kind": "property", "displayName": "Interceptor Classes", "group": "monitoring", "label": "common,monitoring", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafk [...]
     "kerberosBeforeReloginMinTime": { "kind": "property", "displayName": "Kerberos Before Relogin Min Time", "group": "security", "label": "common,security", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "60000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Login thread sleep time between refresh attempts." },
     "kerberosInitCmd": { "kind": "property", "displayName": "Kerberos Init Cmd", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "\/usr\/bin\/kinit", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Kerberos kinit command path. Default is \/usr\/bin\/kinit" },
@@ -96,7 +97,7 @@
     "kerberosRenewWindowFactor": { "kind": "property", "displayName": "Kerberos Renew Window Factor", "group": "security", "label": "common,security", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "secret": false, "defaultValue": "0.8", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Login thread will sleep until the specified window factor of time from last ref [...]
     "saslJaasConfig": { "kind": "property", "displayName": "Sasl Jaas Config", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username [...]
     "saslKerberosServiceName": { "kind": "property", "displayName": "Sasl Kerberos Service Name", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The Kerberos principal name that Kafka runs as. This can be defined either in Kafka's JAAS config or in Ka [...]
-    "saslMechanism": { "kind": "property", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "GSSAPI", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see a href= h [...]
+    "saslMechanism": { "kind": "property", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "GSSAPI", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see http:\/\/ [...]
     "securityProtocol": { "kind": "property", "displayName": "Security Protocol", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "PLAINTEXT", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and SSL are supported" },
     "sslCipherSuites": { "kind": "property", "displayName": "Ssl Cipher Suites", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "A list of cipher suites. This is a named combination of authentication, encryption, MAC and key exchange algorithm used to  [...]
     "sslContextParameters": { "kind": "property", "displayName": "Ssl Context Parameters", "group": "security", "label": "common,security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "SSL configuration using a Camel SSLContextParameters object. If configured it's [...]
@@ -111,9 +112,8 @@
     "sslProvider": { "kind": "property", "displayName": "Ssl Provider", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The name of the security provider used for SSL connections. Default value is the default security provider of the JVM." },
     "sslTrustmanagerAlgorithm": { "kind": "property", "displayName": "Ssl Trustmanager Algorithm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "PKIX", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The algorithm used by trust manager factory for SSL connections. Default value is [...]
     "sslTruststoreLocation": { "kind": "property", "displayName": "Ssl Truststore Location", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The location of the trust store file." },
-    "sslTruststoreType": { "kind": "property", "displayName": "Ssl Truststore Type", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "JKS", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The file format of the trust store file. Default value is JKS." },
-    "schemaRegistryURL": { "kind": "property", "displayName": "Schema Registry URL", "group": "confluent", "label": "confluent", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema [...]
     "sslTruststorePassword": { "kind": "property", "displayName": "Ssl Truststore Password", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The password for the trust store file." },
+    "sslTruststoreType": { "kind": "property", "displayName": "Ssl Truststore Type", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "JKS", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The file format of the trust store file. Default value is JKS." },
     "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Enable usage of global SSL context parameters." }
   },
   "properties": {
@@ -188,6 +188,7 @@
     "workerPoolMaxSize": { "kind": "parameter", "displayName": "Worker Pool Max Size", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "20", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Maximum number of threads for the worker pool for continue routing Exchange after kafka server has a [...]
     "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
+    "schemaRegistryURL": { "kind": "parameter", "displayName": "Schema Registry URL", "group": "confluent", "label": "confluent", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schem [...]
     "interceptorClasses": { "kind": "parameter", "displayName": "Interceptor Classes", "group": "monitoring", "label": "common,monitoring", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kaf [...]
     "kerberosBeforeReloginMinTime": { "kind": "parameter", "displayName": "Kerberos Before Relogin Min Time", "group": "security", "label": "common,security", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "defaultValue": "60000", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Login thread sleep time between refresh attempts." },
     "kerberosInitCmd": { "kind": "parameter", "displayName": "Kerberos Init Cmd", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "\/usr\/bin\/kinit", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Kerberos kinit command path. Default is \/usr\/bin\/kinit" },
@@ -196,7 +197,7 @@
     "kerberosRenewWindowFactor": { "kind": "parameter", "displayName": "Kerberos Renew Window Factor", "group": "security", "label": "common,security", "required": false, "type": "number", "javaType": "java.lang.Double", "deprecated": false, "secret": false, "defaultValue": "0.8", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Login thread will sleep until the specified window factor of time from last re [...]
     "saslJaasConfig": { "kind": "parameter", "displayName": "Sasl Jaas Config", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required usernam [...]
     "saslKerberosServiceName": { "kind": "parameter", "displayName": "Sasl Kerberos Service Name", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The Kerberos principal name that Kafka runs as. This can be defined either in Kafka's JAAS config or in K [...]
-    "saslMechanism": { "kind": "parameter", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "GSSAPI", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see a href=  [...]
+    "saslMechanism": { "kind": "parameter", "displayName": "Sasl Mechanism", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "GSSAPI", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see http:\/\ [...]
     "securityProtocol": { "kind": "parameter", "displayName": "Security Protocol", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "PLAINTEXT", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and SSL are supported" },
     "sslCipherSuites": { "kind": "parameter", "displayName": "Ssl Cipher Suites", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "A list of cipher suites. This is a named combination of authentication, encryption, MAC and key exchange algorithm used to [...]
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "security", "label": "common,security", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "SSL configuration using a Camel SSLContextParameters object. If configured it' [...]
@@ -212,7 +213,6 @@
     "sslTrustmanagerAlgorithm": { "kind": "parameter", "displayName": "Ssl Trustmanager Algorithm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "PKIX", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The algorithm used by trust manager factory for SSL connections. Default value i [...]
     "sslTruststoreLocation": { "kind": "parameter", "displayName": "Ssl Truststore Location", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The location of the trust store file." },
     "sslTruststorePassword": { "kind": "parameter", "displayName": "Ssl Truststore Password", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The password for the trust store file." },
-    "sslTruststoreType": { "kind": "parameter", "displayName": "Ssl Truststore Type", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "JKS", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The file format of the trust store file. Default value is JKS." },
-    "schemaRegistryURL": { "kind": "parameter", "displayName": "Schema Registry URL", "group": "confluent", "label": "confluent", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schem [...]
+    "sslTruststoreType": { "kind": "parameter", "displayName": "Ssl Truststore Type", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "JKS", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The file format of the trust store file. Default value is JKS." }
   }
 }
diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc
index b8b38c8..d647dd9 100644
--- a/components/camel-kafka/src/main/docs/kafka-component.adoc
+++ b/components/camel-kafka/src/main/docs/kafka-component.adoc
@@ -112,6 +112,7 @@ The Kafka component supports 96 options, which are listed below.
 | *workerPoolCoreSize* (producer) | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | 10 | Integer
 | *workerPoolMaxSize* (producer) | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | 20 | Integer
 | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+| *schemaRegistryURL* (confluent) | URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema.registry.url in the Confluent Platform documentation. This option is only available in the Confluent Platform (not standard Apache Kafka) |  | String
 | *interceptorClasses* (monitoring) | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime |  | String
 | *kerberosBeforeReloginMinTime* (security) | Login thread sleep time between refresh attempts. | 60000 | Integer
 | *kerberosInitCmd* (security) | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String
@@ -120,7 +121,7 @@ The Kafka component supports 96 options, which are listed below.
 | *kerberosRenewWindowFactor* (security) | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double
 | *saslJaasConfig* (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=USERNAME password=PASSWORD; |  | String
 | *saslKerberosServiceName* (security) | The Kerberos principal name that Kafka runs as. This can be defined either in Kafka's JAAS config or in Kafka's config. |  | String
-| *saslMechanism* (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see a href= \http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml\http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
+| *saslMechanism* (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see \http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
 | *securityProtocol* (security) | Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and SSL are supported | PLAINTEXT | String
 | *sslCipherSuites* (security) | A list of cipher suites. This is a named combination of authentication, encryption, MAC and key exchange algorithm used to negotiate the security settings for a network connection using TLS or SSL network protocol.By default all the available cipher suites are supported. |  | String
 | *sslContextParameters* (security) | SSL configuration using a Camel SSLContextParameters object. If configured it's applied before the other SSL endpoint parameters. |  | SSLContextParameters
@@ -135,9 +136,8 @@ The Kafka component supports 96 options, which are listed below.
 | *sslProvider* (security) | The name of the security provider used for SSL connections. Default value is the default security provider of the JVM. |  | String
 | *sslTrustmanagerAlgorithm* (security) | The algorithm used by trust manager factory for SSL connections. Default value is the trust manager factory algorithm configured for the Java Virtual Machine. | PKIX | String
 | *sslTruststoreLocation* (security) | The location of the trust store file. |  | String
-| *sslTruststoreType* (security) | The file format of the trust store file. Default value is JKS. | JKS | String
-| *schemaRegistryURL* (confluent) | URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema.registry.url in the Confluent Platform documentation. This option is only available in the Confluent Platform (not standard Apache Kafka) |  | String
 | *sslTruststorePassword* (security) | The password for the trust store file. |  | String
+| *sslTruststoreType* (security) | The file format of the trust store file. Default value is JKS. | JKS | String
 | *useGlobalSslContextParameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 |===
 // component options: END
@@ -239,6 +239,7 @@ with the following path and query parameters:
 | *workerPoolMaxSize* (producer) | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | 20 | Integer
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *schemaRegistryURL* (confluent) | URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema.registry.url in the Confluent Platform documentation. This option is only available in the Confluent Platform (not standard Apache Kafka) |  | String
 | *interceptorClasses* (monitoring) | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime |  | String
 | *kerberosBeforeReloginMinTime* (security) | Login thread sleep time between refresh attempts. | 60000 | Integer
 | *kerberosInitCmd* (security) | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String
@@ -247,7 +248,7 @@ with the following path and query parameters:
 | *kerberosRenewWindowFactor* (security) | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double
 | *saslJaasConfig* (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=USERNAME password=PASSWORD; |  | String
 | *saslKerberosServiceName* (security) | The Kerberos principal name that Kafka runs as. This can be defined either in Kafka's JAAS config or in Kafka's config. |  | String
-| *saslMechanism* (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see a href= \http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml\http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
+| *saslMechanism* (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see \http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
 | *securityProtocol* (security) | Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and SSL are supported | PLAINTEXT | String
 | *sslCipherSuites* (security) | A list of cipher suites. This is a named combination of authentication, encryption, MAC and key exchange algorithm used to negotiate the security settings for a network connection using TLS or SSL network protocol.By default all the available cipher suites are supported. |  | String
 | *sslContextParameters* (security) | SSL configuration using a Camel SSLContextParameters object. If configured it's applied before the other SSL endpoint parameters. |  | SSLContextParameters
@@ -264,7 +265,6 @@ with the following path and query parameters:
 | *sslTruststoreLocation* (security) | The location of the trust store file. |  | String
 | *sslTruststorePassword* (security) | The password for the trust store file. |  | String
 | *sslTruststoreType* (security) | The file format of the trust store file. Default value is JKS. | JKS | String
-| *schemaRegistryURL* (confluent) | URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema.registry.url in the Confluent Platform documentation. This option is only available in the Confluent Platform (not standard Apache Kafka) |  | String
 |===
 // endpoint options: END
 
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java
index d8d0897..37a3b54 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java
@@ -1146,6 +1146,22 @@ public interface KafkaComponentBuilderFactory {
             return this;
         }
         /**
+         * URL of the Confluent Platform schema registry servers to use. The
+         * format is host1:port1,host2:port2. This is known as
+         * schema.registry.url in the Confluent Platform documentation. This
+         * option is only available in the Confluent Platform (not standard
+         * Apache Kafka).
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: confluent
+         */
+        default KafkaComponentBuilder schemaRegistryURL(
+                java.lang.String schemaRegistryURL) {
+            doSetProperty("schemaRegistryURL", schemaRegistryURL);
+            return this;
+        }
+        /**
          * Sets interceptors for producer or consumers. Producer interceptors
          * have to be classes implementing
          * org.apache.kafka.clients.producer.ProducerInterceptor Consumer
@@ -1266,8 +1282,8 @@ public interface KafkaComponentBuilderFactory {
         }
         /**
          * The Simple Authentication and Security Layer (SASL) Mechanism used.
-         * For the valid values see a href=
-         * http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtmlhttp://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml.
+         * For the valid values see
+         * http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -1474,44 +1490,28 @@ public interface KafkaComponentBuilderFactory {
             return this;
         }
         /**
-         * The file format of the trust store file. Default value is JKS.
+         * The password for the trust store file.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: JKS
          * Group: security
          */
-        default KafkaComponentBuilder sslTruststoreType(
-                java.lang.String sslTruststoreType) {
-            doSetProperty("sslTruststoreType", sslTruststoreType);
-            return this;
-        }
-        /**
-         * URL of the Confluent Platform schema registry servers to use. The
-         * format is host1:port1,host2:port2. This is known as
-         * schema.registry.url in the Confluent Platform documentation. This
-         * option is only available in the Confluent Platform (not standard
-         * Apache Kafka).
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: confluent
-         */
-        default KafkaComponentBuilder schemaRegistryURL(
-                java.lang.String schemaRegistryURL) {
-            doSetProperty("schemaRegistryURL", schemaRegistryURL);
+        default KafkaComponentBuilder sslTruststorePassword(
+                java.lang.String sslTruststorePassword) {
+            doSetProperty("sslTruststorePassword", sslTruststorePassword);
             return this;
         }
         /**
-         * The password for the trust store file.
+         * The file format of the trust store file. Default value is JKS.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
+         * Default: JKS
          * Group: security
          */
-        default KafkaComponentBuilder sslTruststorePassword(
-                java.lang.String sslTruststorePassword) {
-            doSetProperty("sslTruststorePassword", sslTruststorePassword);
+        default KafkaComponentBuilder sslTruststoreType(
+                java.lang.String sslTruststoreType) {
+            doSetProperty("sslTruststoreType", sslTruststoreType);
             return this;
         }
         /**
@@ -1620,6 +1620,7 @@ public interface KafkaComponentBuilderFactory {
             case "workerPoolCoreSize": getOrCreateConfiguration((KafkaComponent) component).setWorkerPoolCoreSize((java.lang.Integer) value); return true;
             case "workerPoolMaxSize": getOrCreateConfiguration((KafkaComponent) component).setWorkerPoolMaxSize((java.lang.Integer) value); return true;
             case "basicPropertyBinding": ((KafkaComponent) component).setBasicPropertyBinding((boolean) value); return true;
+            case "schemaRegistryURL": getOrCreateConfiguration((KafkaComponent) component).setSchemaRegistryURL((java.lang.String) value); return true;
             case "interceptorClasses": getOrCreateConfiguration((KafkaComponent) component).setInterceptorClasses((java.lang.String) value); return true;
             case "kerberosBeforeReloginMinTime": getOrCreateConfiguration((KafkaComponent) component).setKerberosBeforeReloginMinTime((java.lang.Integer) value); return true;
             case "kerberosInitCmd": getOrCreateConfiguration((KafkaComponent) component).setKerberosInitCmd((java.lang.String) value); return true;
@@ -1643,9 +1644,8 @@ public interface KafkaComponentBuilderFactory {
             case "sslProvider": getOrCreateConfiguration((KafkaComponent) component).setSslProvider((java.lang.String) value); return true;
             case "sslTrustmanagerAlgorithm": getOrCreateConfiguration((KafkaComponent) component).setSslTrustmanagerAlgorithm((java.lang.String) value); return true;
             case "sslTruststoreLocation": getOrCreateConfiguration((KafkaComponent) component).setSslTruststoreLocation((java.lang.String) value); return true;
-            case "sslTruststoreType": getOrCreateConfiguration((KafkaComponent) component).setSslTruststoreType((java.lang.String) value); return true;
-            case "schemaRegistryURL": getOrCreateConfiguration((KafkaComponent) component).setSchemaRegistryURL((java.lang.String) value); return true;
             case "sslTruststorePassword": getOrCreateConfiguration((KafkaComponent) component).setSslTruststorePassword((java.lang.String) value); return true;
+            case "sslTruststoreType": getOrCreateConfiguration((KafkaComponent) component).setSslTruststoreType((java.lang.String) value); return true;
             case "useGlobalSslContextParameters": ((KafkaComponent) component).setUseGlobalSslContextParameters((boolean) value); return true;
             default: return false;
             }
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
index 95f48b1..bbcae0a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java
@@ -975,6 +975,22 @@ public interface KafkaEndpointBuilderFactory {
             return this;
         }
         /**
+         * URL of the Confluent Platform schema registry servers to use. The
+         * format is host1:port1,host2:port2. This is known as
+         * schema.registry.url in the Confluent Platform documentation. This
+         * option is only available in the Confluent Platform (not standard
+         * Apache Kafka).
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: confluent
+         */
+        default KafkaEndpointConsumerBuilder schemaRegistryURL(
+                String schemaRegistryURL) {
+            doSetProperty("schemaRegistryURL", schemaRegistryURL);
+            return this;
+        }
+        /**
          * Sets interceptors for producer or consumers. Producer interceptors
          * have to be classes implementing
          * org.apache.kafka.clients.producer.ProducerInterceptor Consumer
@@ -1137,8 +1153,8 @@ public interface KafkaEndpointBuilderFactory {
         }
         /**
          * The Simple Authentication and Security Layer (SASL) Mechanism used.
-         * For the valid values see a href=
-         * http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtmlhttp://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml.
+         * For the valid values see
+         * http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -1319,22 +1335,6 @@ public interface KafkaEndpointBuilderFactory {
             doSetProperty("sslTruststoreType", sslTruststoreType);
             return this;
         }
-        /**
-         * URL of the Confluent Platform schema registry servers to use. The
-         * format is host1:port1,host2:port2. This is known as
-         * schema.registry.url in the Confluent Platform documentation. This
-         * option is only available in the Confluent Platform (not standard
-         * Apache Kafka).
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: confluent
-         */
-        default KafkaEndpointConsumerBuilder schemaRegistryURL(
-                String schemaRegistryURL) {
-            doSetProperty("schemaRegistryURL", schemaRegistryURL);
-            return this;
-        }
     }
 
     /**
@@ -2561,6 +2561,22 @@ public interface KafkaEndpointBuilderFactory {
             return this;
         }
         /**
+         * URL of the Confluent Platform schema registry servers to use. The
+         * format is host1:port1,host2:port2. This is known as
+         * schema.registry.url in the Confluent Platform documentation. This
+         * option is only available in the Confluent Platform (not standard
+         * Apache Kafka).
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: confluent
+         */
+        default KafkaEndpointProducerBuilder schemaRegistryURL(
+                String schemaRegistryURL) {
+            doSetProperty("schemaRegistryURL", schemaRegistryURL);
+            return this;
+        }
+        /**
          * Sets interceptors for producer or consumers. Producer interceptors
          * have to be classes implementing
          * org.apache.kafka.clients.producer.ProducerInterceptor Consumer
@@ -2723,8 +2739,8 @@ public interface KafkaEndpointBuilderFactory {
         }
         /**
          * The Simple Authentication and Security Layer (SASL) Mechanism used.
-         * For the valid values see a href=
-         * http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtmlhttp://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml.
+         * For the valid values see
+         * http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -2968,22 +2984,6 @@ public interface KafkaEndpointBuilderFactory {
             doSetProperty("sslTruststoreType", sslTruststoreType);
             return this;
         }
-        /**
-         * URL of the Confluent Platform schema registry servers to use. The
-         * format is host1:port1,host2:port2. This is known as
-         * schema.registry.url in the Confluent Platform documentation. This
-         * option is only available in the Confluent Platform (not standard
-         * Apache Kafka).
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: confluent
-         */
-        default KafkaEndpointProducerBuilder schemaRegistryURL(
-                String schemaRegistryURL) {
-            doSetProperty("schemaRegistryURL", schemaRegistryURL);
-            return this;
-        }
     }
 
     /**
@@ -3191,6 +3191,21 @@ public interface KafkaEndpointBuilderFactory {
             return this;
         }
         /**
+         * URL of the Confluent Platform schema registry servers to use. The
+         * format is host1:port1,host2:port2. This is known as
+         * schema.registry.url in the Confluent Platform documentation. This
+         * option is only available in the Confluent Platform (not standard
+         * Apache Kafka).
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: confluent
+         */
+        default KafkaEndpointBuilder schemaRegistryURL(String schemaRegistryURL) {
+            doSetProperty("schemaRegistryURL", schemaRegistryURL);
+            return this;
+        }
+        /**
          * Sets interceptors for producer or consumers. Producer interceptors
          * have to be classes implementing
          * org.apache.kafka.clients.producer.ProducerInterceptor Consumer
@@ -3351,8 +3366,8 @@ public interface KafkaEndpointBuilderFactory {
         }
         /**
          * The Simple Authentication and Security Layer (SASL) Mechanism used.
-         * For the valid values see a href=
-         * http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtmlhttp://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml.
+         * For the valid values see
+         * http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -3529,21 +3544,6 @@ public interface KafkaEndpointBuilderFactory {
             doSetProperty("sslTruststoreType", sslTruststoreType);
             return this;
         }
-        /**
-         * URL of the Confluent Platform schema registry servers to use. The
-         * format is host1:port1,host2:port2. This is known as
-         * schema.registry.url in the Confluent Platform documentation. This
-         * option is only available in the Confluent Platform (not standard
-         * Apache Kafka).
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: confluent
-         */
-        default KafkaEndpointBuilder schemaRegistryURL(String schemaRegistryURL) {
-            doSetProperty("schemaRegistryURL", schemaRegistryURL);
-            return this;
-        }
     }
 
     /**
diff --git a/docs/components/modules/ROOT/pages/kafka-component.adoc b/docs/components/modules/ROOT/pages/kafka-component.adoc
index 98ef316..190d4cd 100644
--- a/docs/components/modules/ROOT/pages/kafka-component.adoc
+++ b/docs/components/modules/ROOT/pages/kafka-component.adoc
@@ -113,6 +113,7 @@ The Kafka component supports 96 options, which are listed below.
 | *workerPoolCoreSize* (producer) | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | 10 | Integer
 | *workerPoolMaxSize* (producer) | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | 20 | Integer
 | *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+| *schemaRegistryURL* (confluent) | URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema.registry.url in the Confluent Platform documentation. This option is only available in the Confluent Platform (not standard Apache Kafka) |  | String
 | *interceptorClasses* (monitoring) | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime |  | String
 | *kerberosBeforeReloginMinTime* (security) | Login thread sleep time between refresh attempts. | 60000 | Integer
 | *kerberosInitCmd* (security) | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String
@@ -121,7 +122,7 @@ The Kafka component supports 96 options, which are listed below.
 | *kerberosRenewWindowFactor* (security) | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double
 | *saslJaasConfig* (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=USERNAME password=PASSWORD; |  | String
 | *saslKerberosServiceName* (security) | The Kerberos principal name that Kafka runs as. This can be defined either in Kafka's JAAS config or in Kafka's config. |  | String
-| *saslMechanism* (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see a href= \http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml\http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
+| *saslMechanism* (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see \http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
 | *securityProtocol* (security) | Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and SSL are supported | PLAINTEXT | String
 | *sslCipherSuites* (security) | A list of cipher suites. This is a named combination of authentication, encryption, MAC and key exchange algorithm used to negotiate the security settings for a network connection using TLS or SSL network protocol.By default all the available cipher suites are supported. |  | String
 | *sslContextParameters* (security) | SSL configuration using a Camel SSLContextParameters object. If configured it's applied before the other SSL endpoint parameters. |  | SSLContextParameters
@@ -136,9 +137,8 @@ The Kafka component supports 96 options, which are listed below.
 | *sslProvider* (security) | The name of the security provider used for SSL connections. Default value is the default security provider of the JVM. |  | String
 | *sslTrustmanagerAlgorithm* (security) | The algorithm used by trust manager factory for SSL connections. Default value is the trust manager factory algorithm configured for the Java Virtual Machine. | PKIX | String
 | *sslTruststoreLocation* (security) | The location of the trust store file. |  | String
-| *sslTruststoreType* (security) | The file format of the trust store file. Default value is JKS. | JKS | String
-| *schemaRegistryURL* (confluent) | URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema.registry.url in the Confluent Platform documentation. This option is only available in the Confluent Platform (not standard Apache Kafka) |  | String
 | *sslTruststorePassword* (security) | The password for the trust store file. |  | String
+| *sslTruststoreType* (security) | The file format of the trust store file. Default value is JKS. | JKS | String
 | *useGlobalSslContextParameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 |===
 // component options: END
@@ -240,6 +240,7 @@ with the following path and query parameters:
 | *workerPoolMaxSize* (producer) | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | 20 | Integer
 | *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
+| *schemaRegistryURL* (confluent) | URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema.registry.url in the Confluent Platform documentation. This option is only available in the Confluent Platform (not standard Apache Kafka) |  | String
 | *interceptorClasses* (monitoring) | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime |  | String
 | *kerberosBeforeReloginMinTime* (security) | Login thread sleep time between refresh attempts. | 60000 | Integer
 | *kerberosInitCmd* (security) | Kerberos kinit command path. Default is /usr/bin/kinit | /usr/bin/kinit | String
@@ -248,7 +249,7 @@ with the following path and query parameters:
 | *kerberosRenewWindowFactor* (security) | Login thread will sleep until the specified window factor of time from last refresh to ticket's expiry has been reached, at which time it will try to renew the ticket. | 0.8 | Double
 | *saslJaasConfig* (security) | Expose the kafka sasl.jaas.config parameter Example: org.apache.kafka.common.security.plain.PlainLoginModule required username=USERNAME password=PASSWORD; |  | String
 | *saslKerberosServiceName* (security) | The Kerberos principal name that Kafka runs as. This can be defined either in Kafka's JAAS config or in Kafka's config. |  | String
-| *saslMechanism* (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see a href= \http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml\http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
+| *saslMechanism* (security) | The Simple Authentication and Security Layer (SASL) Mechanism used. For the valid values see \http://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml | GSSAPI | String
 | *securityProtocol* (security) | Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and SSL are supported | PLAINTEXT | String
 | *sslCipherSuites* (security) | A list of cipher suites. This is a named combination of authentication, encryption, MAC and key exchange algorithm used to negotiate the security settings for a network connection using TLS or SSL network protocol.By default all the available cipher suites are supported. |  | String
 | *sslContextParameters* (security) | SSL configuration using a Camel SSLContextParameters object. If configured it's applied before the other SSL endpoint parameters. |  | SSLContextParameters
@@ -265,7 +266,6 @@ with the following path and query parameters:
 | *sslTruststoreLocation* (security) | The location of the trust store file. |  | String
 | *sslTruststorePassword* (security) | The password for the trust store file. |  | String
 | *sslTruststoreType* (security) | The file format of the trust store file. Default value is JKS. | JKS | String
-| *schemaRegistryURL* (confluent) | URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema.registry.url in the Confluent Platform documentation. This option is only available in the Confluent Platform (not standard Apache Kafka) |  | String
 |===
 // endpoint options: END
 
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointHelper.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointHelper.java
index 2abb0d8..fefd8c0 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointHelper.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointHelper.java
@@ -151,10 +151,13 @@ public final class EndpointHelper {
             } else if (score2 < score1) {
                 return 1;
             } else {
-                // compare by full label and name
-                int score = label1.compareToIgnoreCase(label2);
+                int score = group1.compareToIgnoreCase(group2);
                 if (score == 0) {
-                    score = name1.compareToIgnoreCase(name2);
+                    // compare by full label and name
+                    score = label1.compareToIgnoreCase(label2);
+                    if (score == 0) {
+                        score = name1.compareToIgnoreCase(name2);
+                    }
                 }
                 return score;
             }
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
new file mode 100644
index 0000000..3eaad08
--- /dev/null
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.maven.packaging;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Objects;
+
+import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.model.JsonMapper;
+import org.apache.camel.tooling.util.PackageHelper;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class EndpointHelperTest {
+
+    @Test
+    public void testIfCreateJavaClassCorrectly() throws IOException {
+        final String json = PackageHelper.loadText(new File(Objects.requireNonNull(getClass().getClassLoader().getResource("json/test_component3.json")).getFile()));
+        final ComponentModel componentModel = JsonMapper.generateComponentModel(json);
+
+        componentModel.getComponentOptions().sort(EndpointHelper.createGroupAndLabelComparator());
+
+        assertEquals("schemaRegistryURL", componentModel.getComponentOptions().get(0).getName());
+        assertEquals("sslTrustmanagerAlgorithm", componentModel.getComponentOptions().get(1).getName());
+        assertEquals("sslTruststoreLocation", componentModel.getComponentOptions().get(2).getName());
+        assertEquals("sslTruststorePassword", componentModel.getComponentOptions().get(3).getName());
+        assertEquals("sslTruststoreType", componentModel.getComponentOptions().get(4).getName());
+        assertEquals("useGlobalSslContextParameters", componentModel.getComponentOptions().get(5).getName());
+    }
+
+}
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component3.json b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component3.json
new file mode 100644
index 0000000..8aff006
--- /dev/null
+++ b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component3.json
@@ -0,0 +1,31 @@
+{
+  "component": {
+    "kind": "component",
+    "scheme": "kafka",
+    "extendsScheme": "",
+    "syntax": "kafka:topic",
+    "title": "Kafka",
+    "description": "The kafka component allows messages to be sent to (or consumed from) Apache Kafka brokers.",
+    "label": "messaging",
+    "deprecated": false,
+    "async": false,
+    "consumerOnly": false,
+    "producerOnly": false,
+    "lenientProperties": false,
+    "javaType": "org.apache.camel.component.kafka.KafkaComponent",
+    "firstVersion": "2.13.0",
+    "groupId": "org.apache.camel",
+    "artifactId": "camel-kafka",
+    "version": "3.2.0-SNAPSHOT"
+  },
+  "componentProperties": {
+    "sslTrustmanagerAlgorithm": { "kind": "property", "displayName": "Ssl Trustmanager Algorithm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "PKIX", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The algorithm used by trust manager factory for SSL connections. Default value is [...]
+    "sslTruststoreType": { "kind": "property", "displayName": "Ssl Truststore Type", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "JKS", "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The file format of the trust store file. Default value is JKS." },
+    "schemaRegistryURL": { "kind": "property", "displayName": "Schema Registry URL", "group": "confluent", "label": "confluent", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "URL of the Confluent Platform schema registry servers to use. The format is host1:port1,host2:port2. This is known as schema [...]
+    "sslTruststoreLocation": { "kind": "property", "displayName": "Ssl Truststore Location", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The location of the trust store file." },
+    "sslTruststorePassword": { "kind": "property", "displayName": "Ssl Truststore Password", "group": "security", "label": "producer,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The password for the trust store file." },
+    "useGlobalSslContextParameters": { "kind": "property", "displayName": "Use Global Ssl Context Parameters", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Enable usage of global SSL context parameters." }
+  },
+  "properties": {
+  }
+}


[camel] 11/18: Rename Spark(Component|Endpoint) to SparkRest\1 to avoid conflicts in the endpoint dsl

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

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

commit 6f8f601854cba2b1dd620621743aa785afa9eb86
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 19:18:08 2020 +0100

    Rename Spark(Component|Endpoint) to SparkRest\1 to avoid conflicts in the endpoint dsl
---
 .../sparkrest/SparkComponentConfigurer.java        | 65 ----------------------
 .../sparkrest/SparkEndpointConfigurer.java         | 45 ---------------
 2 files changed, 110 deletions(-)

diff --git a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java
deleted file mode 100644
index d60c1b1..0000000
--- a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.sparkrest;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class SparkComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
-
-    private org.apache.camel.component.sparkrest.SparkConfiguration getOrCreateConfiguration(SparkRestComponent target) {
-        if (target.getSparkConfiguration() == null) {
-            target.setSparkConfiguration(new org.apache.camel.component.sparkrest.SparkConfiguration());
-        }
-        return target.getSparkConfiguration();
-    }
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SparkRestComponent target = (SparkRestComponent) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "basicpropertybinding":
-        case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
-        case "disablestreamcache":
-        case "disableStreamCache": getOrCreateConfiguration(target).setDisableStreamCache(property(camelContext, boolean.class, value)); return true;
-        case "ipaddress":
-        case "ipAddress": target.setIpAddress(property(camelContext, java.lang.String.class, value)); return true;
-        case "keystorefile":
-        case "keystoreFile": target.setKeystoreFile(property(camelContext, java.lang.String.class, value)); return true;
-        case "keystorepassword":
-        case "keystorePassword": target.setKeystorePassword(property(camelContext, java.lang.String.class, value)); return true;
-        case "mapheaders":
-        case "mapHeaders": getOrCreateConfiguration(target).setMapHeaders(property(camelContext, boolean.class, value)); return true;
-        case "matchonuriprefix":
-        case "matchOnUriPrefix": getOrCreateConfiguration(target).setMatchOnUriPrefix(property(camelContext, boolean.class, value)); return true;
-        case "maxthreads":
-        case "maxThreads": target.setMaxThreads(property(camelContext, int.class, value)); return true;
-        case "minthreads":
-        case "minThreads": target.setMinThreads(property(camelContext, int.class, value)); return true;
-        case "port": target.setPort(property(camelContext, int.class, value)); return true;
-        case "sparkbinding":
-        case "sparkBinding": target.setSparkBinding(property(camelContext, org.apache.camel.component.sparkrest.SparkBinding.class, value)); return true;
-        case "sparkconfiguration":
-        case "sparkConfiguration": target.setSparkConfiguration(property(camelContext, org.apache.camel.component.sparkrest.SparkConfiguration.class, value)); return true;
-        case "timeoutmillis":
-        case "timeOutMillis": target.setTimeOutMillis(property(camelContext, int.class, value)); return true;
-        case "transferexception":
-        case "transferException": getOrCreateConfiguration(target).setTransferException(property(camelContext, boolean.class, value)); return true;
-        case "truststorefile":
-        case "truststoreFile": target.setTruststoreFile(property(camelContext, java.lang.String.class, value)); return true;
-        case "truststorepassword":
-        case "truststorePassword": target.setTruststorePassword(property(camelContext, java.lang.String.class, value)); return true;
-        case "urldecodeheaders":
-        case "urlDecodeHeaders": getOrCreateConfiguration(target).setUrlDecodeHeaders(property(camelContext, boolean.class, value)); return true;
-        default: return false;
-        }
-    }
-
-}
-
diff --git a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java
deleted file mode 100644
index 5210d4a..0000000
--- a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.sparkrest;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.support.component.PropertyConfigurerSupport;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class SparkEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SparkRestEndpoint target = (SparkRestEndpoint) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "accept": target.setAccept(property(camelContext, java.lang.String.class, value)); return true;
-        case "basicpropertybinding":
-        case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
-        case "bridgeerrorhandler":
-        case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
-        case "disablestreamcache":
-        case "disableStreamCache": target.getSparkConfiguration().setDisableStreamCache(property(camelContext, boolean.class, value)); return true;
-        case "exceptionhandler":
-        case "exceptionHandler": target.setExceptionHandler(property(camelContext, org.apache.camel.spi.ExceptionHandler.class, value)); return true;
-        case "exchangepattern":
-        case "exchangePattern": target.setExchangePattern(property(camelContext, org.apache.camel.ExchangePattern.class, value)); return true;
-        case "mapheaders":
-        case "mapHeaders": target.getSparkConfiguration().setMapHeaders(property(camelContext, boolean.class, value)); return true;
-        case "matchonuriprefix":
-        case "matchOnUriPrefix": target.getSparkConfiguration().setMatchOnUriPrefix(property(camelContext, boolean.class, value)); return true;
-        case "sparkbinding":
-        case "sparkBinding": target.setSparkBinding(property(camelContext, org.apache.camel.component.sparkrest.SparkBinding.class, value)); return true;
-        case "synchronous": target.setSynchronous(property(camelContext, boolean.class, value)); return true;
-        case "transferexception":
-        case "transferException": target.getSparkConfiguration().setTransferException(property(camelContext, boolean.class, value)); return true;
-        case "urldecodeheaders":
-        case "urlDecodeHeaders": target.getSparkConfiguration().setUrlDecodeHeaders(property(camelContext, boolean.class, value)); return true;
-        default: return false;
-        }
-    }
-
-}
-


[camel] 06/18: Fix docs

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

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

commit 2b81e6d0b371f1e9ed6c1aa05a113c7731cbcab5
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 17:33:18 2020 +0100

    Fix docs
---
 .../src/main/docs/properties-component.adoc            |  0
 .../modules/ROOT/pages/constant-language.adoc          |  2 +-
 .../modules/ROOT/pages/exchangeProperty-language.adoc  |  2 +-
 docs/components/modules/ROOT/pages/file-language.adoc  |  2 +-
 .../components/modules/ROOT/pages/header-language.adoc |  2 +-
 docs/components/modules/ROOT/pages/index.adoc          | 18 ++++++++----------
 docs/components/modules/ROOT/pages/ref-language.adoc   |  2 +-
 .../components/modules/ROOT/pages/simple-language.adoc |  2 +-
 .../modules/ROOT/pages/tokenize-language.adoc          |  2 +-
 docs/gulpfile.js                                       |  6 +++---
 docs/user-manual/modules/ROOT/nav.adoc                 |  7 -------
 .../modules/ROOT/pages/constant-language.adoc          |  2 +-
 .../modules/ROOT/pages/exchangeProperty-language.adoc  |  2 +-
 docs/user-manual/modules/ROOT/pages/file-language.adoc |  2 +-
 .../modules/ROOT/pages/header-language.adoc            |  2 +-
 docs/user-manual/modules/ROOT/pages/ref-language.adoc  |  2 +-
 .../modules/ROOT/pages/simple-language.adoc            |  2 +-
 .../modules/ROOT/pages/tokenize-language.adoc          |  2 +-
 .../camel/maven/packaging/PrepareCatalogMojo.java      | 10 ++++++++--
 19 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/core/camel-core-languages/src/main/docs/properties-component.adoc b/core/camel-base/src/main/docs/properties-component.adoc
similarity index 100%
rename from core/camel-core-languages/src/main/docs/properties-component.adoc
rename to core/camel-base/src/main/docs/properties-component.adoc
diff --git a/docs/components/modules/ROOT/pages/constant-language.adoc b/docs/components/modules/ROOT/pages/constant-language.adoc
index 872be17..a8ef0e0 100644
--- a/docs/components/modules/ROOT/pages/constant-language.adoc
+++ b/docs/components/modules/ROOT/pages/constant-language.adoc
@@ -1,6 +1,6 @@
 [[constant-language]]
 = Constant Language
-:page-source: core/camel-base/src/main/docs/constant-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/constant-language.adoc
 
 *Since Camel 1.5*
 
diff --git a/docs/components/modules/ROOT/pages/exchangeProperty-language.adoc b/docs/components/modules/ROOT/pages/exchangeProperty-language.adoc
index f26a26f..c6c0a60 100644
--- a/docs/components/modules/ROOT/pages/exchangeProperty-language.adoc
+++ b/docs/components/modules/ROOT/pages/exchangeProperty-language.adoc
@@ -1,6 +1,6 @@
 [[exchangeProperty-language]]
 = ExchangeProperty Language
-:page-source: core/camel-base/src/main/docs/exchangeProperty-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/exchangeProperty-language.adoc
 
 *Since Camel 2.0*
 
diff --git a/docs/components/modules/ROOT/pages/file-language.adoc b/docs/components/modules/ROOT/pages/file-language.adoc
index a0ae9b0..88bfa2c 100644
--- a/docs/components/modules/ROOT/pages/file-language.adoc
+++ b/docs/components/modules/ROOT/pages/file-language.adoc
@@ -1,6 +1,6 @@
 [[file-language]]
 = File Language
-:page-source: core/camel-base/src/main/docs/file-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/file-language.adoc
 
 *Since Camel 1.1*
 
diff --git a/docs/components/modules/ROOT/pages/header-language.adoc b/docs/components/modules/ROOT/pages/header-language.adoc
index e80167b..c2134f4 100644
--- a/docs/components/modules/ROOT/pages/header-language.adoc
+++ b/docs/components/modules/ROOT/pages/header-language.adoc
@@ -1,6 +1,6 @@
 [[header-language]]
 = Header Language
-:page-source: core/camel-base/src/main/docs/header-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/header-language.adoc
 
 *Since Camel 1.5*
 
diff --git a/docs/components/modules/ROOT/pages/index.adoc b/docs/components/modules/ROOT/pages/index.adoc
index a199191..d9baa1c 100644
--- a/docs/components/modules/ROOT/pages/index.adoc
+++ b/docs/components/modules/ROOT/pages/index.adoc
@@ -781,7 +781,7 @@ Number of Data Formats: 45 in 37 JAR artifacts (0 deprecated)
 == Expression Languages
 
 // languages: START
-Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
+Number of Languages: 16 in 10 JAR artifacts (0 deprecated)
 
 [width="100%",cols="4,1,5",options="header"]
 |===
@@ -789,15 +789,15 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
 
 | xref:bean-language.adoc[Bean method] (camel-bean) | 1.3 | To use a Java bean (aka method call) in Camel expressions or predicates.
 
-| xref:constant-language.adoc[Constant] (camel-base) | 1.5 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing.
+| xref:constant-language.adoc[Constant] (camel-core-languages) | 1.5 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing.
 
-| xref:exchangeProperty-language.adoc[ExchangeProperty] (camel-base) | 2.0 | To use a Camel Exchange property in expressions or predicates.
+| xref:exchangeProperty-language.adoc[ExchangeProperty] (camel-core-languages) | 2.0 | To use a Camel Exchange property in expressions or predicates.
 
-| xref:file-language.adoc[File] (camel-base) | 1.1 | For expressions and predicates using the file/simple language.
+| xref:file-language.adoc[File] (camel-core-languages) | 1.1 | For expressions and predicates using the file/simple language.
 
 | xref:groovy-language.adoc[Groovy] (camel-groovy) | 1.3 | To use Groovy scripts in Camel expressions or predicates.
 
-| xref:header-language.adoc[Header] (camel-base) | 1.5 | To use a Camel Message header in expressions or predicates.
+| xref:header-language.adoc[Header] (camel-core-languages) | 1.5 | To use a Camel Message header in expressions or predicates.
 
 | xref:hl7terser-language.adoc[HL7 Terser] (camel-hl7) | 2.11 | To use HL7 terser scripts in Camel expressions or predicates.
 
@@ -807,15 +807,13 @@ Number of Languages: 17 in 11 JAR artifacts (0 deprecated)
 
 | xref:ognl-language.adoc[OGNL] (camel-ognl) | 1.1 | To use OGNL scripts in Camel expressions or predicates.
 
-| xref:ref-language.adoc[Ref] (camel-base) | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
+| xref:ref-language.adoc[Ref] (camel-core-languages) | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
 
-| xref:simple-language.adoc[Simple] (camel-base) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
+| xref:simple-language.adoc[Simple] (camel-core-languages) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
 
 | xref:spel-language.adoc[SpEL] (camel-spring) | 2.7 | To use Spring Expression Language (SpEL) in Camel expressions or predicates.
 
-| xref:tokenize-language.adoc[Tokenize] (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
-
-| xref:xtokenize-language.adoc[XML Tokenize] (camel-xml-jaxp) | 2.14 | To use Camel message body or header with a XML tokenizer in Camel expressions or predicates.
+| xref:tokenize-language.adoc[Tokenize] (camel-core-languages) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
 
 | xref:xpath-language.adoc[XPath] (camel-xpath) | 1.1 | To use XPath (XML) in Camel expressions or predicates.
 
diff --git a/docs/components/modules/ROOT/pages/ref-language.adoc b/docs/components/modules/ROOT/pages/ref-language.adoc
index 1423291..0b86da1 100644
--- a/docs/components/modules/ROOT/pages/ref-language.adoc
+++ b/docs/components/modules/ROOT/pages/ref-language.adoc
@@ -1,6 +1,6 @@
 [[ref-language]]
 = Ref Language
-:page-source: core/camel-base/src/main/docs/ref-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/ref-language.adoc
 
 *Since Camel 2.8*
 
diff --git a/docs/components/modules/ROOT/pages/simple-language.adoc b/docs/components/modules/ROOT/pages/simple-language.adoc
index ac942b1..c135562 100644
--- a/docs/components/modules/ROOT/pages/simple-language.adoc
+++ b/docs/components/modules/ROOT/pages/simple-language.adoc
@@ -1,6 +1,6 @@
 [[simple-language]]
 = Simple Language
-:page-source: core/camel-base/src/main/docs/simple-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/simple-language.adoc
 
 *Since Camel 1.1*
 
diff --git a/docs/components/modules/ROOT/pages/tokenize-language.adoc b/docs/components/modules/ROOT/pages/tokenize-language.adoc
index 250b9cf..bf1f30a 100644
--- a/docs/components/modules/ROOT/pages/tokenize-language.adoc
+++ b/docs/components/modules/ROOT/pages/tokenize-language.adoc
@@ -1,6 +1,6 @@
 [[tokenize-language]]
 = Tokenize Language
-:page-source: core/camel-base/src/main/docs/tokenize-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/tokenize-language.adoc
 
 *Since Camel 2.0*
 
diff --git a/docs/gulpfile.js b/docs/gulpfile.js
index 6380dd9..9a99f71 100644
--- a/docs/gulpfile.js
+++ b/docs/gulpfile.js
@@ -35,7 +35,7 @@ function deleteComponentImageSymlinks() {
 }
 
 function createComponentSymlinks() {
-    return src(['../core/camel-base/src/main/docs/*.adoc', '../core/camel-xml-jaxp/src/main/docs/*.adoc', '../components/{*,*/*}/src/main/docs/*.adoc'])
+    return src(['../core/camel-base/src/main/docs/*.adoc', '../core/camel-core-languages/src/main/docs/*.adoc', '../core/camel-xml-jaxp/src/main/docs/*.adoc', '../components/{*,*/*}/src/main/docs/*.adoc'])
         .pipe(map((file, done) => {
             // this flattens the output to just .../pages/....adoc
             // instead of .../pages/camel-.../src/main/docs/....adoc
@@ -80,7 +80,7 @@ function deleteUserManualSymlinks() {
 }
 
 function createUserManualSymlinks() {
-    return src(['../core/camel-base/src/main/docs/*.adoc', '../core/camel-xml-jaxp/src/main/docs/*.adoc', '../core/camel-core-engine/src/main/docs/eips/*.adoc'])
+    return src(['../core/camel-base/src/main/docs/*.adoc', '../core/camel-core-languages/src/main/docs/*.adoc', '../core/camel-xml-jaxp/src/main/docs/*.adoc', '../core/camel-core-engine/src/main/docs/eips/*.adoc'])
         // Antora disabled symlinks, there is an issue open
         // https://gitlab.com/antora/antora/issues/188
         // to reinstate symlink support, until that's resolved
@@ -122,7 +122,7 @@ function insertSourceAttribute() {
 function createComponentNav() {
     return src('component-nav.adoc.template')
         .pipe(insertGeneratedNotice())
-        .pipe(inject(src(['../core/camel-base/src/main/docs/*-component.adoc', '../components/{*,*/*}/src/main/docs/*.adoc']).pipe(sort()), {
+        .pipe(inject(src(['../core/camel-base/src/main/docs/*-component.adoc', '../core/camel-core-languages/src/main/docs/*-component.adoc', '../components/{*,*/*}/src/main/docs/*.adoc']).pipe(sort()), {
             removeTags: true,
             transform: (filename, file) => {
                 const filepath = path.basename(filename);
diff --git a/docs/user-manual/modules/ROOT/nav.adoc b/docs/user-manual/modules/ROOT/nav.adoc
index dbbca5c..174090d 100644
--- a/docs/user-manual/modules/ROOT/nav.adoc
+++ b/docs/user-manual/modules/ROOT/nav.adoc
@@ -52,14 +52,7 @@
  ** xref:spring.adoc[Spring support]
 * xref:using-osgi-blueprint-with-camel.adoc[Using OSGi blueprint with Camel]
 * Supported expression languages
- ** xref:constant-language.adoc[Constant Language]
- ** xref:exchangeProperty-language.adoc[ExchangeProperty Language]
- ** xref:file-language.adoc[File Language]
- ** xref:header-language.adoc[Header Language]
  ** xref:properties-component.adoc[Properties Component]
- ** xref:ref-language.adoc[Ref Language]
- ** xref:simple-language.adoc[Simple Language]
- ** xref:tokenize-language.adoc[Tokenize Language]
 * xref:enterprise-integration-patterns.adoc[Enterprise Integration Patterns]
  ** xref:aggregate-eip.adoc[Aggregate EIP]
  ** xref:batch-config-eip.adoc[Batch-config EIP]
diff --git a/docs/user-manual/modules/ROOT/pages/constant-language.adoc b/docs/user-manual/modules/ROOT/pages/constant-language.adoc
index 872be17..a8ef0e0 100644
--- a/docs/user-manual/modules/ROOT/pages/constant-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/constant-language.adoc
@@ -1,6 +1,6 @@
 [[constant-language]]
 = Constant Language
-:page-source: core/camel-base/src/main/docs/constant-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/constant-language.adoc
 
 *Since Camel 1.5*
 
diff --git a/docs/user-manual/modules/ROOT/pages/exchangeProperty-language.adoc b/docs/user-manual/modules/ROOT/pages/exchangeProperty-language.adoc
index f26a26f..c6c0a60 100644
--- a/docs/user-manual/modules/ROOT/pages/exchangeProperty-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/exchangeProperty-language.adoc
@@ -1,6 +1,6 @@
 [[exchangeProperty-language]]
 = ExchangeProperty Language
-:page-source: core/camel-base/src/main/docs/exchangeProperty-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/exchangeProperty-language.adoc
 
 *Since Camel 2.0*
 
diff --git a/docs/user-manual/modules/ROOT/pages/file-language.adoc b/docs/user-manual/modules/ROOT/pages/file-language.adoc
index a0ae9b0..88bfa2c 100644
--- a/docs/user-manual/modules/ROOT/pages/file-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/file-language.adoc
@@ -1,6 +1,6 @@
 [[file-language]]
 = File Language
-:page-source: core/camel-base/src/main/docs/file-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/file-language.adoc
 
 *Since Camel 1.1*
 
diff --git a/docs/user-manual/modules/ROOT/pages/header-language.adoc b/docs/user-manual/modules/ROOT/pages/header-language.adoc
index e80167b..c2134f4 100644
--- a/docs/user-manual/modules/ROOT/pages/header-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/header-language.adoc
@@ -1,6 +1,6 @@
 [[header-language]]
 = Header Language
-:page-source: core/camel-base/src/main/docs/header-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/header-language.adoc
 
 *Since Camel 1.5*
 
diff --git a/docs/user-manual/modules/ROOT/pages/ref-language.adoc b/docs/user-manual/modules/ROOT/pages/ref-language.adoc
index 1423291..0b86da1 100644
--- a/docs/user-manual/modules/ROOT/pages/ref-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/ref-language.adoc
@@ -1,6 +1,6 @@
 [[ref-language]]
 = Ref Language
-:page-source: core/camel-base/src/main/docs/ref-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/ref-language.adoc
 
 *Since Camel 2.8*
 
diff --git a/docs/user-manual/modules/ROOT/pages/simple-language.adoc b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
index ac942b1..c135562 100644
--- a/docs/user-manual/modules/ROOT/pages/simple-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/simple-language.adoc
@@ -1,6 +1,6 @@
 [[simple-language]]
 = Simple Language
-:page-source: core/camel-base/src/main/docs/simple-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/simple-language.adoc
 
 *Since Camel 1.1*
 
diff --git a/docs/user-manual/modules/ROOT/pages/tokenize-language.adoc b/docs/user-manual/modules/ROOT/pages/tokenize-language.adoc
index 250b9cf..bf1f30a 100644
--- a/docs/user-manual/modules/ROOT/pages/tokenize-language.adoc
+++ b/docs/user-manual/modules/ROOT/pages/tokenize-language.adoc
@@ -1,6 +1,6 @@
 [[tokenize-language]]
 = Tokenize Language
-:page-source: core/camel-base/src/main/docs/tokenize-language.adoc
+:page-source: core/camel-core-languages/src/main/docs/tokenize-language.adoc
 
 *Since Camel 2.0*
 
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
index c9426cc..361e28e 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/PrepareCatalogMojo.java
@@ -158,6 +158,12 @@ public class PrepareCatalogMojo extends AbstractMojo {
     protected File baseDir;
 
     /**
+     * The camel-core-languages directory
+     */
+    @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-core-languages")
+    protected File languagesDir;
+
+    /**
      * The camel-xml-jaxp directory
      */
     @Parameter(defaultValue = "${project.build.directory}/../../../core/camel-xml-jaxp")
@@ -217,7 +223,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
             allJsonFiles = new TreeSet<>();
             allPropertiesFiles = new TreeSet<>();
 
-            Stream.concat(list(componentsDir.toPath()), Stream.of(coreDir.toPath(), baseDir.toPath(), jaxpDir.toPath(), springDir.toPath()))
+            Stream.concat(list(componentsDir.toPath()), Stream.of(coreDir.toPath(), baseDir.toPath(), languagesDir.toPath(), jaxpDir.toPath(), springDir.toPath()))
                     .filter(dir -> !"target".equals(dir.getFileName().toString())).map(this::getComponentPath).filter(dir -> Files.isDirectory(dir.resolve("src")))
                     .map(p -> p.resolve("target/classes")).flatMap(PackageHelper::walk).forEach(p -> {
                         String f = p.getFileName().toString();
@@ -645,7 +651,7 @@ public class PrepareCatalogMojo extends AbstractMojo {
 
         // find all camel maven modules
         Stream.concat(list(componentsDir.toPath()).filter(dir -> !"target".equals(dir.getFileName().toString())).map(this::getComponentPath),
-                Stream.of(coreDir.toPath(), baseDir.toPath(), jaxpDir.toPath()))
+                Stream.of(coreDir.toPath(), baseDir.toPath(), languagesDir.toPath(), jaxpDir.toPath()))
                 .forEach(dir -> {
                     List<Path> l = PackageHelper.walk(dir.resolve("src/main/docs")).filter(f -> f.getFileName().toString().endsWith(".adoc")).collect(Collectors.toList());
                     if (l.isEmpty()) {


[camel] 09/18: Regen bom

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

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

commit 60bd43fca93303c5723b1136f9421d1148ee0c82
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 18:01:10 2020 +0100

    Regen bom
---
 bom/camel-bom/pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/bom/camel-bom/pom.xml b/bom/camel-bom/pom.xml
index 8a7dae7..f656513 100644
--- a/bom/camel-bom/pom.xml
+++ b/bom/camel-bom/pom.xml
@@ -499,6 +499,11 @@
       </dependency>
       <dependency>
         <groupId>org.apache.camel</groupId>
+        <artifactId>camel-core-languages</artifactId>
+        <version>${project.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.camel</groupId>
         <artifactId>camel-core-osgi</artifactId>
         <version>${project.version}</version>
       </dependency>


[camel] 16/18: Fix xml-security endpoints doc

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

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

commit 9224b4497777a1e1bb6a3e5b6da80e743d633ce8
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Mar 3 06:40:47 2020 +0100

    Fix xml-security endpoints doc
---
 .../component/xmlsecurity/xmlsecurity-sign.json    |  28 +++---
 .../component/xmlsecurity/xmlsecurity-verify.json  |  30 +++---
 .../src/main/docs/xmlsecurity-sign-component.adoc  |  28 +++---
 .../main/docs/xmlsecurity-verify-component.adoc    |  30 +++---
 .../processor/XmlSignatureConfiguration.java       |  14 +--
 .../XmlsecuritySignComponentBuilderFactory.java    |  58 ++++++------
 .../XmlsecurityVerifyComponentBuilderFactory.java  |  58 ++++++------
 .../dsl/XmlSignerEndpointBuilderFactory.java       | 104 ++++++++++-----------
 .../dsl/XmlVerifierEndpointBuilderFactory.java     |  80 ++++++++--------
 .../ROOT/pages/xmlsecurity-sign-component.adoc     |  28 +++---
 .../ROOT/pages/xmlsecurity-verify-component.adoc   |  30 +++---
 .../camel/maven/packaging/EndpointHelperTest.java  |  30 ++++--
 .../src/test/resources/json/test_component4.json   |  24 +----
 13 files changed, 268 insertions(+), 274 deletions(-)

diff --git a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json
index 49f475a..93ea18f 100644
--- a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json
+++ b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json
@@ -20,19 +20,19 @@
   },
   "componentProperties": {
     "addKeyInfoReference": { "kind": "property", "displayName": "Add Key Info Reference", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "In order to protect the KeyInfo element from tampering you can add a referenc [...]
-    "baseUri": { "kind": "property", "displayName": "Base Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI." },
+    "baseUri": { "kind": "property", "displayName": "Base Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI." },
     "canonicalizationMethod": { "kind": "property", "displayName": "Canonicalization Method", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.xml.crypto.AlgorithmMethod", "deprecated": false, "secret": false, "defaultValue": "http:\/\/www.w3.org\/TR\/2001\/REC-xml-c14n-20010315", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Canonicaliz [...]
-    "clearHeaders": { "kind": "property", "displayName": "Clear Headers", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Determines if the XML signature specific headers be cleared after signing and verificatio [...]
+    "clearHeaders": { "kind": "property", "displayName": "Clear Headers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Determines if the XML signature specific headers be cleared after signing and verific [...]
     "contentObjectId": { "kind": "property", "displayName": "Content Object Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Sets the content object Id attribute value. By default a UUID is generated. If you set the null value, then a ne [...]
     "contentReferenceType": { "kind": "property", "displayName": "Content Reference Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Type of the content reference. The default value is null. This value can be overwritten by the header  [...]
     "contentReferenceUri": { "kind": "property", "displayName": "Content Reference Uri", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Reference URI for the content to be signed. Only used in the enveloped case. If the reference URI contai [...]
-    "cryptoContextProperties": { "kind": "property", "displayName": "Crypto Context Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Sets the crypto context properties. See {link XMLCryptoCont [...]
+    "cryptoContextProperties": { "kind": "property", "displayName": "Crypto Context Properties", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Sets the crypto context properties. See {link XMLCrypto [...]
     "digestAlgorithm": { "kind": "property", "displayName": "Digest Algorithm", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Digest algorithm URI. Optional parameter. This digest algorithm is used for calculating the digest of the input m [...]
-    "disallowDoctypeDecl": { "kind": "property", "displayName": "Disallow Doctype Decl", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declaration. [...]
+    "disallowDoctypeDecl": { "kind": "property", "displayName": "Disallow Doctype Decl", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declarat [...]
     "keyAccessor": { "kind": "property", "displayName": "Key Accessor", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.KeyAccessor", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "For the signing process, a private key is necessary. You specify a key accessor bea [...]
-    "omitXmlDeclaration": { "kind": "property", "displayName": "Omit Xml Declaration", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Indicator whether the XML declaration in the outgoing message body should b [...]
-    "outputXmlEncoding": { "kind": "property", "displayName": "Output Xml Encoding", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the original X [...]
     "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
+    "omitXmlDeclaration": { "kind": "property", "displayName": "Omit Xml Declaration", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Indicator whether the XML declaration in the outgoing message body shou [...]
+    "outputXmlEncoding": { "kind": "property", "displayName": "Output Xml Encoding", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the origin [...]
     "parentLocalName": { "kind": "property", "displayName": "Parent Local Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Local name of the parent element to which the XML signature element will be added. Only relevant for enveloped X [...]
     "parentNamespace": { "kind": "property", "displayName": "Parent Namespace", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Namespace of the parent element to which the XML signature element will be added." },
     "parentXpath": { "kind": "property", "displayName": "Parent Xpath", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.xml.crypto.dsig.spec.XPathFilterParameterSpec", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Sets the XPath to find the parent node in the enveloped case. Either you specify the p [...]
@@ -40,7 +40,7 @@
     "plainTextEncoding": { "kind": "property", "displayName": "Plain Text Encoding", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Encoding of the plain text. Only relevant if the message body is plain text (see pa [...]
     "prefixForXmlSignatureNamespace": { "kind": "property", "displayName": "Prefix For Xml Signature Namespace", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "ds", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Namespace prefix for the XML signature namespace http:\/\/ [...]
     "properties": { "kind": "property", "displayName": "Properties", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "For adding additional References and Objects to the XML signature which con [...]
-    "schemaResourceUri": { "kind": "property", "displayName": "Schema Resource Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID [...]
+    "schemaResourceUri": { "kind": "property", "displayName": "Schema Resource Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining th [...]
     "signatureAlgorithm": { "kind": "property", "displayName": "Signature Algorithm", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "http:\/\/www.w3.org\/2001\/04\/xmldsig-more#rsa-sha256", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Signature algorithm. Default valu [...]
     "signatureId": { "kind": "property", "displayName": "Signature Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Sets the signature Id. If this parameter is not set (null value) then a unique ID is generated for the signature ID (defa [...]
     "transformMethods": { "kind": "property", "displayName": "Transform Methods", "group": "producer", "label": "", "required": false, "type": "array", "javaType": "java.util.List<javax.xml.crypto.AlgorithmMethod>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "signerConfiguration", "description": "Transforms which are executed on the message body before the digest is calculate [...]
@@ -52,19 +52,19 @@
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The name part in the URI can be chosen by the user to distinguish between different signer endpoints within the camel context." },
     "addKeyInfoReference": { "kind": "parameter", "displayName": "Add Key Info Reference", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "In order to protect the KeyInfo element from tampering you can add a reference to  [...]
-    "baseUri": { "kind": "parameter", "displayName": "Base Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI." },
+    "baseUri": { "kind": "parameter", "displayName": "Base Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI." },
     "canonicalizationMethod": { "kind": "parameter", "displayName": "Canonicalization Method", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.xml.crypto.AlgorithmMethod", "deprecated": false, "secret": false, "defaultValue": "http:\/\/www.w3.org\/TR\/2001\/REC-xml-c14n-20010315", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Canonicalization [...]
-    "clearHeaders": { "kind": "parameter", "displayName": "Clear Headers", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Determines if the XML signature specific headers be cleared after signing and verification. De [...]
+    "clearHeaders": { "kind": "parameter", "displayName": "Clear Headers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Determines if the XML signature specific headers be cleared after signing and verification [...]
     "contentObjectId": { "kind": "parameter", "displayName": "Content Object Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Sets the content object Id attribute value. By default a UUID is generated. If you set the null value, then a new UUI [...]
     "contentReferenceType": { "kind": "parameter", "displayName": "Content Reference Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Type of the content reference. The default value is null. This value can be overwritten by the header XmlSi [...]
     "contentReferenceUri": { "kind": "parameter", "displayName": "Content Reference Uri", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Reference URI for the content to be signed. Only used in the enveloped case. If the reference URI contains an [...]
-    "cryptoContextProperties": { "kind": "parameter", "displayName": "Crypto Context Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Sets the crypto context properties. See {link XMLCryptoContext#s [...]
+    "cryptoContextProperties": { "kind": "parameter", "displayName": "Crypto Context Properties", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Sets the crypto context properties. See {link XMLCryptoConte [...]
     "digestAlgorithm": { "kind": "parameter", "displayName": "Digest Algorithm", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Digest algorithm URI. Optional parameter. This digest algorithm is used for calculating the digest of the input messag [...]
-    "disallowDoctypeDecl": { "kind": "parameter", "displayName": "Disallow Doctype Decl", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declaration. The  [...]
+    "disallowDoctypeDecl": { "kind": "parameter", "displayName": "Disallow Doctype Decl", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declaration.  [...]
     "keyAccessor": { "kind": "parameter", "displayName": "Key Accessor", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.KeyAccessor", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "For the signing process, a private key is necessary. You specify a key accessor bean whi [...]
-    "omitXmlDeclaration": { "kind": "parameter", "displayName": "Omit Xml Declaration", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Indicator whether the XML declaration in the outgoing message body should be omi [...]
-    "outputXmlEncoding": { "kind": "parameter", "displayName": "Output Xml Encoding", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the original XML do [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
+    "omitXmlDeclaration": { "kind": "parameter", "displayName": "Omit Xml Declaration", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Indicator whether the XML declaration in the outgoing message body should be [...]
+    "outputXmlEncoding": { "kind": "parameter", "displayName": "Output Xml Encoding", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the original XM [...]
     "parentLocalName": { "kind": "parameter", "displayName": "Parent Local Name", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Local name of the parent element to which the XML signature element will be added. Only relevant for enveloped XML si [...]
     "parentNamespace": { "kind": "parameter", "displayName": "Parent Namespace", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Namespace of the parent element to which the XML signature element will be added." },
     "parentXpath": { "kind": "parameter", "displayName": "Parent Xpath", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.xml.crypto.dsig.spec.XPathFilterParameterSpec", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Sets the XPath to find the parent node in the enveloped case. Either you specify the parent [...]
@@ -72,7 +72,7 @@
     "plainTextEncoding": { "kind": "parameter", "displayName": "Plain Text Encoding", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "UTF-8", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Encoding of the plain text. Only relevant if the message body is plain text (see paramet [...]
     "prefixForXmlSignatureNamespace": { "kind": "parameter", "displayName": "Prefix For Xml Signature Namespace", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "ds", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Namespace prefix for the XML signature namespace http:\/\/www.w [...]
     "properties": { "kind": "parameter", "displayName": "Properties", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "For adding additional References and Objects to the XML signature which contain  [...]
-    "schemaResourceUri": { "kind": "parameter", "displayName": "Schema Resource Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attr [...]
+    "schemaResourceUri": { "kind": "parameter", "displayName": "Schema Resource Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID  [...]
     "signatureAlgorithm": { "kind": "parameter", "displayName": "Signature Algorithm", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "http:\/\/www.w3.org\/2001\/04\/xmldsig-more#rsa-sha256", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Signature algorithm. Default value is  [...]
     "signatureId": { "kind": "parameter", "displayName": "Signature Id", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Sets the signature Id. If this parameter is not set (null value) then a unique ID is generated for the signature ID (default). [...]
     "transformMethods": { "kind": "parameter", "displayName": "Transform Methods", "group": "producer", "label": "", "required": false, "type": "array", "javaType": "java.util.List<javax.xml.crypto.AlgorithmMethod>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "configurationField": "configuration", "description": "Transforms which are executed on the message body before the digest is calculated. By [...]
diff --git a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json
index a61e320..c84c20e 100644
--- a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json
+++ b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json
@@ -19,18 +19,18 @@
     "version": "3.2.0-SNAPSHOT"
   },
   "componentProperties": {
-    "baseUri": { "kind": "property", "displayName": "Base Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI." },
-    "clearHeaders": { "kind": "property", "displayName": "Clear Headers", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Determines if the XML signature specific headers be cleared after signing and verific [...]
-    "cryptoContextProperties": { "kind": "property", "displayName": "Crypto Context Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Sets the crypto context properties. See {link XMLCrypto [...]
-    "disallowDoctypeDecl": { "kind": "property", "displayName": "Disallow Doctype Decl", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declarat [...]
+    "baseUri": { "kind": "property", "displayName": "Base Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI." },
+    "clearHeaders": { "kind": "property", "displayName": "Clear Headers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Determines if the XML signature specific headers be cleared after signing and ver [...]
+    "cryptoContextProperties": { "kind": "property", "displayName": "Crypto Context Properties", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Sets the crypto context properties. See {link XMLCr [...]
+    "disallowDoctypeDecl": { "kind": "property", "displayName": "Disallow Doctype Decl", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE decl [...]
     "keySelector": { "kind": "property", "displayName": "Key Selector", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.xml.crypto.KeySelector", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Provides the key for validating the XML signature." },
-    "omitXmlDeclaration": { "kind": "property", "displayName": "Omit Xml Declaration", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Indicator whether the XML declaration in the outgoing message body shou [...]
+    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
+    "omitXmlDeclaration": { "kind": "property", "displayName": "Omit Xml Declaration", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Indicator whether the XML declaration in the outgoing message body  [...]
     "outputNodeSearch": { "kind": "property", "displayName": "Output Node Search", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Sets the output node search value for determining the node from the XML signature document which shall be  [...]
     "outputNodeSearchType": { "kind": "property", "displayName": "Output Node Search Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Default", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Determines the search type for determining the output node which is se [...]
-    "outputXmlEncoding": { "kind": "property", "displayName": "Output Xml Encoding", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the origin [...]
+    "outputXmlEncoding": { "kind": "property", "displayName": "Output Xml Encoding", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the or [...]
     "removeSignatureElements": { "kind": "property", "displayName": "Remove Signature Elements", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Indicator whether the XML signature elements (elements with local [...]
-    "schemaResourceUri": { "kind": "property", "displayName": "Schema Resource Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining th [...]
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
+    "schemaResourceUri": { "kind": "property", "displayName": "Schema Resource Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determinin [...]
     "secureValidation": { "kind": "property", "displayName": "Secure Validation", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Enables secure validation. If true then secure validation is enabled." },
     "validationFailedHandler": { "kind": "property", "displayName": "Validation Failed Handler", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Handles the different validation failed si [...]
     "xmlSignature2Message": { "kind": "property", "displayName": "Xml Signature2 Message", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.XmlSignature2Message", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Bean which maps the XML signature to the output-mes [...]
@@ -41,18 +41,18 @@
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The name part in the URI can be chosen by the user to distinguish between different verify endpoints within the camel context." },
-    "baseUri": { "kind": "parameter", "displayName": "Base Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI." },
-    "clearHeaders": { "kind": "parameter", "displayName": "Clear Headers", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Determines if the XML signature specific headers be cleared after signing and verification.  [...]
-    "cryptoContextProperties": { "kind": "parameter", "displayName": "Crypto Context Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Sets the crypto context properties. See {link XMLCryptoContext [...]
-    "disallowDoctypeDecl": { "kind": "parameter", "displayName": "Disallow Doctype Decl", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declaration. Th [...]
+    "baseUri": { "kind": "parameter", "displayName": "Base Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI." },
+    "clearHeaders": { "kind": "parameter", "displayName": "Clear Headers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Determines if the XML signature specific headers be cleared after signing and verificati [...]
+    "cryptoContextProperties": { "kind": "parameter", "displayName": "Crypto Context Properties", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Sets the crypto context properties. See {link XMLCryptoCon [...]
+    "disallowDoctypeDecl": { "kind": "parameter", "displayName": "Disallow Doctype Decl", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declaration [...]
     "keySelector": { "kind": "parameter", "displayName": "Key Selector", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.xml.crypto.KeySelector", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Provides the key for validating the XML signature." },
-    "omitXmlDeclaration": { "kind": "parameter", "displayName": "Omit Xml Declaration", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Indicator whether the XML declaration in the outgoing message body should be o [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
+    "omitXmlDeclaration": { "kind": "parameter", "displayName": "Omit Xml Declaration", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Indicator whether the XML declaration in the outgoing message body should  [...]
     "outputNodeSearch": { "kind": "parameter", "displayName": "Output Node Search", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Sets the output node search value for determining the node from the XML signature document which shall be set to  [...]
     "outputNodeSearchType": { "kind": "parameter", "displayName": "Output Node Search Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Default", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Determines the search type for determining the output node which is serialize [...]
-    "outputXmlEncoding": { "kind": "parameter", "displayName": "Output Xml Encoding", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the original XML  [...]
+    "outputXmlEncoding": { "kind": "parameter", "displayName": "Output Xml Encoding", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the original  [...]
     "removeSignatureElements": { "kind": "parameter", "displayName": "Remove Signature Elements", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Indicator whether the XML signature elements (elements with local name S [...]
-    "schemaResourceUri": { "kind": "parameter", "displayName": "Schema Resource Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID at [...]
+    "schemaResourceUri": { "kind": "parameter", "displayName": "Schema Resource Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the I [...]
     "secureValidation": { "kind": "parameter", "displayName": "Secure Validation", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Enables secure validation. If true then secure validation is enabled." },
     "validationFailedHandler": { "kind": "parameter", "displayName": "Validation Failed Handler", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Handles the different validation failed situation [...]
     "xmlSignature2Message": { "kind": "parameter", "displayName": "Xml Signature2 Message", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.XmlSignature2Message", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Bean which maps the XML signature to the output-message af [...]
diff --git a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-sign-component.adoc b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-sign-component.adoc
index 474ebe3..0dd5f1a 100644
--- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-sign-component.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-sign-component.adoc
@@ -241,19 +241,19 @@ The XML Security Sign component supports 29 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *addKeyInfoReference* (producer) | In order to protect the KeyInfo element from tampering you can add a reference to the signed info element so that it is protected via the signature value. The default value is true. Only relevant when a KeyInfo is returned by KeyAccessor. and KeyInfo#getId() is not null. | true | Boolean
-| *baseUri* (common) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
+| *baseUri* (producer) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
 | *canonicalizationMethod* (producer) | Canonicalization method used to canonicalize the SignedInfo element before the digest is calculated. You can use the helper methods XmlSignatureHelper.getCanonicalizationMethod(String algorithm) or getCanonicalizationMethod(String algorithm, List inclusiveNamespacePrefixes) to create a canonicalization method. | http://www.w3.org/TR/2001/REC-xml-c14n-20010315 | AlgorithmMethod
-| *clearHeaders* (common) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
+| *clearHeaders* (producer) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
 | *contentObjectId* (producer) | Sets the content object Id attribute value. By default a UUID is generated. If you set the null value, then a new UUID will be generated. Only used in the enveloping case. |  | String
 | *contentReferenceType* (producer) | Type of the content reference. The default value is null. This value can be overwritten by the header XmlSignatureConstants#HEADER_CONTENT_REFERENCE_TYPE. |  | String
 | *contentReferenceUri* (producer) | Reference URI for the content to be signed. Only used in the enveloped case. If the reference URI contains an ID attribute value, then the resource schema URI ( setSchemaResourceUri(String)) must also be set because the schema validator will then find out which attributes are ID attributes. Will be ignored in the enveloping or detached case. |  | String
-| *cryptoContextProperties* (common) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
+| *cryptoContextProperties* (producer) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
 | *digestAlgorithm* (producer) | Digest algorithm URI. Optional parameter. This digest algorithm is used for calculating the digest of the input message. If this digest algorithm is not specified then the digest algorithm is calculated from the signature algorithm. Example: \http://www.w3.org/2001/04/xmlenc#sha256 |  | String
-| *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
+| *disallowDoctypeDecl* (producer) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keyAccessor* (producer) | For the signing process, a private key is necessary. You specify a key accessor bean which provides this private key. The key accessor bean must implement the KeyAccessor interface. The package org.apache.camel.component.xmlsecurity.api contains the default implementation class DefaultKeyAccessor which reads the private key from a Java keystore. |  | KeyAccessor
-| *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
-| *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *omitXmlDeclaration* (producer) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
+| *outputXmlEncoding* (producer) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *parentLocalName* (producer) | Local name of the parent element to which the XML signature element will be added. Only relevant for enveloped XML signature. Alternatively you can also use setParentXpath(XPathFilterParameterSpec). Default value is null. The value must be null for enveloping and detached XML signature. This parameter or the parameter setParentXpath(XPathFilterParameterSpec) for enveloped signature and the parameter setXpathsToIdAttributes(List) for detached signature mus [...]
 | *parentNamespace* (producer) | Namespace of the parent element to which the XML signature element will be added. |  | String
 | *parentXpath* (producer) | Sets the XPath to find the parent node in the enveloped case. Either you specify the parent node via this method or the local name and namespace of the parent with the methods setParentLocalName(String) and setParentNamespace(String). Default value is null. The value must be null for enveloping and detached XML signature. If the parameters parentXpath and parentLocalName are specified in the same configuration then an exception is thrown. |  | XPathFilterPara [...]
@@ -261,7 +261,7 @@ The XML Security Sign component supports 29 options, which are listed below.
 | *plainTextEncoding* (producer) | Encoding of the plain text. Only relevant if the message body is plain text (see parameter plainText. Default value is UTF-8. | UTF-8 | String
 | *prefixForXmlSignatureNamespace* (producer) | Namespace prefix for the XML signature namespace \http://www.w3.org/2000/09/xmldsig#. Default value is ds. If null or an empty value is set then no prefix is used for the XML signature namespace. See best practice \http://www.w3.org/TR/xmldsig-bestpractices/#signing-xml- without-namespaces | ds | String
 | *properties* (producer) | For adding additional References and Objects to the XML signature which contain additional properties, you can provide a bean which implements the XmlSignatureProperties interface. |  | XmlSignatureProperties
-| *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
+| *schemaResourceUri* (producer) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
 | *signatureAlgorithm* (producer) | Signature algorithm. Default value is \http://www.w3.org/2000/09/xmldsig#rsa-sha1. | http://www.w3.org/2001/04/xmldsig-more#rsa-sha256 | String
 | *signatureId* (producer) | Sets the signature Id. If this parameter is not set (null value) then a unique ID is generated for the signature ID (default). If this parameter is set to (empty string) then no Id attribute is created in the signature element. |  | String
 | *transformMethods* (producer) | Transforms which are executed on the message body before the digest is calculated. By default, C14n is added and in the case of enveloped signature (see option parentLocalName) also \http://www.w3.org/2000/09/xmldsig#enveloped-signature is added at position 0 of the list. Use methods in XmlSignatureHelper to create the transform methods. |  | List
@@ -306,19 +306,19 @@ with the following path and query parameters:
 |===
 | Name | Description | Default | Type
 | *addKeyInfoReference* (producer) | In order to protect the KeyInfo element from tampering you can add a reference to the signed info element so that it is protected via the signature value. The default value is true. Only relevant when a KeyInfo is returned by KeyAccessor. and KeyInfo#getId() is not null. | true | Boolean
-| *baseUri* (common) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
+| *baseUri* (producer) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
 | *canonicalizationMethod* (producer) | Canonicalization method used to canonicalize the SignedInfo element before the digest is calculated. You can use the helper methods XmlSignatureHelper.getCanonicalizationMethod(String algorithm) or getCanonicalizationMethod(String algorithm, List inclusiveNamespacePrefixes) to create a canonicalization method. | http://www.w3.org/TR/2001/REC-xml-c14n-20010315 | AlgorithmMethod
-| *clearHeaders* (common) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
+| *clearHeaders* (producer) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
 | *contentObjectId* (producer) | Sets the content object Id attribute value. By default a UUID is generated. If you set the null value, then a new UUID will be generated. Only used in the enveloping case. |  | String
 | *contentReferenceType* (producer) | Type of the content reference. The default value is null. This value can be overwritten by the header XmlSignatureConstants#HEADER_CONTENT_REFERENCE_TYPE. |  | String
 | *contentReferenceUri* (producer) | Reference URI for the content to be signed. Only used in the enveloped case. If the reference URI contains an ID attribute value, then the resource schema URI ( setSchemaResourceUri(String)) must also be set because the schema validator will then find out which attributes are ID attributes. Will be ignored in the enveloping or detached case. |  | String
-| *cryptoContextProperties* (common) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
+| *cryptoContextProperties* (producer) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
 | *digestAlgorithm* (producer) | Digest algorithm URI. Optional parameter. This digest algorithm is used for calculating the digest of the input message. If this digest algorithm is not specified then the digest algorithm is calculated from the signature algorithm. Example: \http://www.w3.org/2001/04/xmlenc#sha256 |  | String
-| *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
+| *disallowDoctypeDecl* (producer) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keyAccessor* (producer) | For the signing process, a private key is necessary. You specify a key accessor bean which provides this private key. The key accessor bean must implement the KeyAccessor interface. The package org.apache.camel.component.xmlsecurity.api contains the default implementation class DefaultKeyAccessor which reads the private key from a Java keystore. |  | KeyAccessor
-| *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
-| *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *omitXmlDeclaration* (producer) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
+| *outputXmlEncoding* (producer) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *parentLocalName* (producer) | Local name of the parent element to which the XML signature element will be added. Only relevant for enveloped XML signature. Alternatively you can also use setParentXpath(XPathFilterParameterSpec). Default value is null. The value must be null for enveloping and detached XML signature. This parameter or the parameter setParentXpath(XPathFilterParameterSpec) for enveloped signature and the parameter setXpathsToIdAttributes(List) for detached signature mus [...]
 | *parentNamespace* (producer) | Namespace of the parent element to which the XML signature element will be added. |  | String
 | *parentXpath* (producer) | Sets the XPath to find the parent node in the enveloped case. Either you specify the parent node via this method or the local name and namespace of the parent with the methods setParentLocalName(String) and setParentNamespace(String). Default value is null. The value must be null for enveloping and detached XML signature. If the parameters parentXpath and parentLocalName are specified in the same configuration then an exception is thrown. |  | XPathFilterPara [...]
@@ -326,7 +326,7 @@ with the following path and query parameters:
 | *plainTextEncoding* (producer) | Encoding of the plain text. Only relevant if the message body is plain text (see parameter plainText. Default value is UTF-8. | UTF-8 | String
 | *prefixForXmlSignatureNamespace* (producer) | Namespace prefix for the XML signature namespace \http://www.w3.org/2000/09/xmldsig#. Default value is ds. If null or an empty value is set then no prefix is used for the XML signature namespace. See best practice \http://www.w3.org/TR/xmldsig-bestpractices/#signing-xml- without-namespaces | ds | String
 | *properties* (producer) | For adding additional References and Objects to the XML signature which contain additional properties, you can provide a bean which implements the XmlSignatureProperties interface. |  | XmlSignatureProperties
-| *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
+| *schemaResourceUri* (producer) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
 | *signatureAlgorithm* (producer) | Signature algorithm. Default value is \http://www.w3.org/2000/09/xmldsig#rsa-sha1. | http://www.w3.org/2001/04/xmldsig-more#rsa-sha256 | String
 | *signatureId* (producer) | Sets the signature Id. If this parameter is not set (null value) then a unique ID is generated for the signature ID (default). If this parameter is set to (empty string) then no Id attribute is created in the signature element. |  | String
 | *transformMethods* (producer) | Transforms which are executed on the message body before the digest is calculated. By default, C14n is added and in the case of enveloped signature (see option parentLocalName) also \http://www.w3.org/2000/09/xmldsig#enveloped-signature is added at position 0 of the list. Use methods in XmlSignatureHelper to create the transform methods. |  | List
diff --git a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-verify-component.adoc b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-verify-component.adoc
index 08d09fb..50de7e2 100644
--- a/components/camel-xmlsecurity/src/main/docs/xmlsecurity-verify-component.adoc
+++ b/components/camel-xmlsecurity/src/main/docs/xmlsecurity-verify-component.adoc
@@ -240,18 +240,18 @@ The XML Security Verify component supports 19 options, which are listed below.
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *baseUri* (common) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
-| *clearHeaders* (common) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
-| *cryptoContextProperties* (common) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
-| *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
+| *baseUri* (producer) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
+| *clearHeaders* (producer) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
+| *cryptoContextProperties* (producer) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
+| *disallowDoctypeDecl* (producer) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keySelector* (producer) | Provides the key for validating the XML signature. |  | KeySelector
-| *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
+| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *omitXmlDeclaration* (producer) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
 | *outputNodeSearch* (producer) | Sets the output node search value for determining the node from the XML signature document which shall be set to the output message body. The class of the value depends on the type of the output node search. The output node search is forwarded to XmlSignature2Message. |  | Object
 | *outputNodeSearchType* (producer) | Determines the search type for determining the output node which is serialized into the output message bodyF. See setOutputNodeSearch(Object). The supported default search types you can find in DefaultXmlSignature2Message. | Default | String
-| *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
+| *outputXmlEncoding* (producer) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *removeSignatureElements* (producer) | Indicator whether the XML signature elements (elements with local name Signature and namesapce \http://www.w3.org/2000/09/xmldsig#) shall be removed from the document set to the output message. Normally, this is only necessary, if the XML signature is enveloped. The default value is Boolean#FALSE. This parameter is forwarded to XmlSignature2Message. This indicator has no effect if the output node search is of type DefaultXmlSignature2Message#OUTPU [...]
-| *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
-| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *schemaResourceUri* (producer) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
 | *secureValidation* (producer) | Enables secure validation. If true then secure validation is enabled. | true | Boolean
 | *validationFailedHandler* (producer) | Handles the different validation failed situations. The default implementation throws specific exceptions for the different situations (All exceptions have the package name org.apache.camel.component.xmlsecurity.api and are a sub-class of XmlSignatureInvalidException. If the signature value validation fails, a XmlSignatureInvalidValueException is thrown. If a reference validation fails, a XmlSignatureInvalidContentHashException is thrown. For more [...]
 | *xmlSignature2Message* (producer) | Bean which maps the XML signature to the output-message after the validation. How this mapping should be done can be configured by the options outputNodeSearchType, outputNodeSearch, and removeSignatureElements. The default implementation offers three possibilities which are related to the three output node search types Default, ElementName, and XPath. The default implementation determines a node which is then serialized and set to the body of the ou [...]
@@ -295,18 +295,18 @@ with the following path and query parameters:
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *baseUri* (common) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
-| *clearHeaders* (common) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
-| *cryptoContextProperties* (common) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
-| *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
+| *baseUri* (producer) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
+| *clearHeaders* (producer) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
+| *cryptoContextProperties* (producer) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
+| *disallowDoctypeDecl* (producer) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keySelector* (producer) | Provides the key for validating the XML signature. |  | KeySelector
-| *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *omitXmlDeclaration* (producer) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
 | *outputNodeSearch* (producer) | Sets the output node search value for determining the node from the XML signature document which shall be set to the output message body. The class of the value depends on the type of the output node search. The output node search is forwarded to XmlSignature2Message. |  | Object
 | *outputNodeSearchType* (producer) | Determines the search type for determining the output node which is serialized into the output message bodyF. See setOutputNodeSearch(Object). The supported default search types you can find in DefaultXmlSignature2Message. | Default | String
-| *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
+| *outputXmlEncoding* (producer) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *removeSignatureElements* (producer) | Indicator whether the XML signature elements (elements with local name Signature and namesapce \http://www.w3.org/2000/09/xmldsig#) shall be removed from the document set to the output message. Normally, this is only necessary, if the XML signature is enveloped. The default value is Boolean#FALSE. This parameter is forwarded to XmlSignature2Message. This indicator has no effect if the output node search is of type DefaultXmlSignature2Message#OUTPU [...]
-| *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
+| *schemaResourceUri* (producer) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
 | *secureValidation* (producer) | Enables secure validation. If true then secure validation is enabled. | true | Boolean
 | *validationFailedHandler* (producer) | Handles the different validation failed situations. The default implementation throws specific exceptions for the different situations (All exceptions have the package name org.apache.camel.component.xmlsecurity.api and are a sub-class of XmlSignatureInvalidException. If the signature value validation fails, a XmlSignatureInvalidValueException is thrown. If a reference validation fails, a XmlSignatureInvalidContentHashException is thrown. For more [...]
 | *xmlSignature2Message* (producer) | Bean which maps the XML signature to the output-message after the validation. How this mapping should be done can be configured by the options outputNodeSearchType, outputNodeSearch, and removeSignatureElements. The default implementation offers three possibilities which are related to the three output node search types Default, ElementName, and XPath. The default implementation determines a node which is then serialized and set to the body of the ou [...]
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
index 95623bd..d25fb0b 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/processor/XmlSignatureConfiguration.java
@@ -32,19 +32,19 @@ import org.apache.camel.spi.UriParams;
 @UriParams
 public abstract class XmlSignatureConfiguration implements Cloneable {
 
-    @UriParam(label = "common")
+    @UriParam(label = "producer")
     private String baseUri;
-    @UriParam(label = "common")
+    @UriParam(label = "producer")
     private Map<String, ?> cryptoContextProperties;
-    @UriParam(label = "common", defaultValue = "true")
+    @UriParam(label = "producer", defaultValue = "true")
     private Boolean disallowDoctypeDecl = Boolean.TRUE;
-    @UriParam(label = "common", defaultValue = "false")
+    @UriParam(label = "producer", defaultValue = "false")
     private Boolean omitXmlDeclaration = Boolean.FALSE;
-    @UriParam(label = "common", defaultValue = "true")
+    @UriParam(label = "producer", defaultValue = "true")
     private Boolean clearHeaders = Boolean.TRUE;
-    @UriParam(label = "common")
+    @UriParam(label = "producer")
     private String schemaResourceUri;
-    @UriParam(label = "common")
+    @UriParam(label = "producer")
     private String outputXmlEncoding;
     @UriParam(label = "advanced")
     private URIDereferencer uriDereferencer;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
index a3fb33a..79cbe60 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
@@ -70,7 +70,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlsecuritySignComponentBuilder baseUri(java.lang.String baseUri) {
             doSetProperty("baseUri", baseUri);
@@ -100,7 +100,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlsecuritySignComponentBuilder clearHeaders(
                 java.lang.Boolean clearHeaders) {
@@ -165,7 +165,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * The option is a: <code>java.util.Map<java.lang.String,
          * java.lang.Object></code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlsecuritySignComponentBuilder cryptoContextProperties(
                 java.util.Map<java.lang.String, java.lang.Object> cryptoContextProperties) {
@@ -195,7 +195,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlsecuritySignComponentBuilder disallowDoctypeDecl(
                 java.lang.Boolean disallowDoctypeDecl) {
@@ -222,6 +222,27 @@ public interface XmlsecuritySignComponentBuilderFactory {
             return this;
         }
         /**
+         * Whether the producer should be started lazy (on the first message).
+         * By starting lazy you can use this to allow CamelContext and routes to
+         * startup in situations where a producer may otherwise fail during
+         * starting and cause the route to fail being started. By deferring this
+         * startup to be lazy then the startup failure can be handled during
+         * routing messages via Camel's routing error handlers. Beware that when
+         * the first message is processed then creating and starting the
+         * producer may take a little time and prolong the total processing time
+         * of the processing.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: producer
+         */
+        default XmlsecuritySignComponentBuilder lazyStartProducer(
+                boolean lazyStartProducer) {
+            doSetProperty("lazyStartProducer", lazyStartProducer);
+            return this;
+        }
+        /**
          * Indicator whether the XML declaration in the outgoing message body
          * should be omitted. Default value is false. Can be overwritten by the
          * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
@@ -229,7 +250,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: false
-         * Group: common
+         * Group: producer
          */
         default XmlsecuritySignComponentBuilder omitXmlDeclaration(
                 java.lang.Boolean omitXmlDeclaration) {
@@ -242,7 +263,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlsecuritySignComponentBuilder outputXmlEncoding(
                 java.lang.String outputXmlEncoding) {
@@ -250,27 +271,6 @@ public interface XmlsecuritySignComponentBuilderFactory {
             return this;
         }
         /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: producer
-         */
-        default XmlsecuritySignComponentBuilder lazyStartProducer(
-                boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-        /**
          * Local name of the parent element to which the XML signature element
          * will be added. Only relevant for enveloped XML signature.
          * Alternatively you can also use
@@ -398,7 +398,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlsecuritySignComponentBuilder schemaResourceUri(
                 java.lang.String schemaResourceUri) {
@@ -555,9 +555,9 @@ public interface XmlsecuritySignComponentBuilderFactory {
             case "digestAlgorithm": getOrCreateConfiguration((XmlSignerComponent) component).setDigestAlgorithm((java.lang.String) value); return true;
             case "disallowDoctypeDecl": getOrCreateConfiguration((XmlSignerComponent) component).setDisallowDoctypeDecl((java.lang.Boolean) value); return true;
             case "keyAccessor": getOrCreateConfiguration((XmlSignerComponent) component).setKeyAccessor((org.apache.camel.component.xmlsecurity.api.KeyAccessor) value); return true;
+            case "lazyStartProducer": ((XmlSignerComponent) component).setLazyStartProducer((boolean) value); return true;
             case "omitXmlDeclaration": getOrCreateConfiguration((XmlSignerComponent) component).setOmitXmlDeclaration((java.lang.Boolean) value); return true;
             case "outputXmlEncoding": getOrCreateConfiguration((XmlSignerComponent) component).setOutputXmlEncoding((java.lang.String) value); return true;
-            case "lazyStartProducer": ((XmlSignerComponent) component).setLazyStartProducer((boolean) value); return true;
             case "parentLocalName": getOrCreateConfiguration((XmlSignerComponent) component).setParentLocalName((java.lang.String) value); return true;
             case "parentNamespace": getOrCreateConfiguration((XmlSignerComponent) component).setParentNamespace((java.lang.String) value); return true;
             case "parentXpath": getOrCreateConfiguration((XmlSignerComponent) component).setParentXpath((javax.xml.crypto.dsig.spec.XPathFilterParameterSpec) value); return true;
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
index 1a53375..9971589 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecurityVerifyComponentBuilderFactory.java
@@ -54,7 +54,7 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlsecurityVerifyComponentBuilder baseUri(
                 java.lang.String baseUri) {
@@ -68,7 +68,7 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlsecurityVerifyComponentBuilder clearHeaders(
                 java.lang.Boolean clearHeaders) {
@@ -88,7 +88,7 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
          * The option is a: <code>java.util.Map<java.lang.String,
          * java.lang.Object></code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlsecurityVerifyComponentBuilder cryptoContextProperties(
                 java.util.Map<java.lang.String, java.lang.Object> cryptoContextProperties) {
@@ -102,7 +102,7 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlsecurityVerifyComponentBuilder disallowDoctypeDecl(
                 java.lang.Boolean disallowDoctypeDecl) {
@@ -122,6 +122,27 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
             return this;
         }
         /**
+         * Whether the producer should be started lazy (on the first message).
+         * By starting lazy you can use this to allow CamelContext and routes to
+         * startup in situations where a producer may otherwise fail during
+         * starting and cause the route to fail being started. By deferring this
+         * startup to be lazy then the startup failure can be handled during
+         * routing messages via Camel's routing error handlers. Beware that when
+         * the first message is processed then creating and starting the
+         * producer may take a little time and prolong the total processing time
+         * of the processing.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: producer
+         */
+        default XmlsecurityVerifyComponentBuilder lazyStartProducer(
+                boolean lazyStartProducer) {
+            doSetProperty("lazyStartProducer", lazyStartProducer);
+            return this;
+        }
+        /**
          * Indicator whether the XML declaration in the outgoing message body
          * should be omitted. Default value is false. Can be overwritten by the
          * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
@@ -129,7 +150,7 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: false
-         * Group: common
+         * Group: producer
          */
         default XmlsecurityVerifyComponentBuilder omitXmlDeclaration(
                 java.lang.Boolean omitXmlDeclaration) {
@@ -173,7 +194,7 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlsecurityVerifyComponentBuilder outputXmlEncoding(
                 java.lang.String outputXmlEncoding) {
@@ -210,7 +231,7 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlsecurityVerifyComponentBuilder schemaResourceUri(
                 java.lang.String schemaResourceUri) {
@@ -218,27 +239,6 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
             return this;
         }
         /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: producer
-         */
-        default XmlsecurityVerifyComponentBuilder lazyStartProducer(
-                boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
-            return this;
-        }
-        /**
          * Enables secure validation. If true then secure validation is enabled.
          * 
          * The option is a: <code>java.lang.Boolean</code> type.
@@ -393,13 +393,13 @@ public interface XmlsecurityVerifyComponentBuilderFactory {
             case "cryptoContextProperties": getOrCreateConfiguration((XmlVerifierComponent) component).setCryptoContextProperties((java.util.Map) value); return true;
             case "disallowDoctypeDecl": getOrCreateConfiguration((XmlVerifierComponent) component).setDisallowDoctypeDecl((java.lang.Boolean) value); return true;
             case "keySelector": getOrCreateConfiguration((XmlVerifierComponent) component).setKeySelector((javax.xml.crypto.KeySelector) value); return true;
+            case "lazyStartProducer": ((XmlVerifierComponent) component).setLazyStartProducer((boolean) value); return true;
             case "omitXmlDeclaration": getOrCreateConfiguration((XmlVerifierComponent) component).setOmitXmlDeclaration((java.lang.Boolean) value); return true;
             case "outputNodeSearch": getOrCreateConfiguration((XmlVerifierComponent) component).setOutputNodeSearch((java.lang.Object) value); return true;
             case "outputNodeSearchType": getOrCreateConfiguration((XmlVerifierComponent) component).setOutputNodeSearchType((java.lang.String) value); return true;
             case "outputXmlEncoding": getOrCreateConfiguration((XmlVerifierComponent) component).setOutputXmlEncoding((java.lang.String) value); return true;
             case "removeSignatureElements": getOrCreateConfiguration((XmlVerifierComponent) component).setRemoveSignatureElements((java.lang.Boolean) value); return true;
             case "schemaResourceUri": getOrCreateConfiguration((XmlVerifierComponent) component).setSchemaResourceUri((java.lang.String) value); return true;
-            case "lazyStartProducer": ((XmlVerifierComponent) component).setLazyStartProducer((boolean) value); return true;
             case "secureValidation": getOrCreateConfiguration((XmlVerifierComponent) component).setSecureValidation((java.lang.Boolean) value); return true;
             case "validationFailedHandler": getOrCreateConfiguration((XmlVerifierComponent) component).setValidationFailedHandler((org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler) value); return true;
             case "xmlSignature2Message": getOrCreateConfiguration((XmlVerifierComponent) component).setXmlSignature2Message((org.apache.camel.component.xmlsecurity.api.XmlSignature2Message) value); return true;
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/XmlSignerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/XmlSignerEndpointBuilderFactory.java
index c1ec0f4..aef25df 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/XmlSignerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/XmlSignerEndpointBuilderFactory.java
@@ -78,7 +78,7 @@ public interface XmlSignerEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlSignerEndpointBuilder baseUri(String baseUri) {
             doSetProperty("baseUri", baseUri);
@@ -126,7 +126,7 @@ public interface XmlSignerEndpointBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlSignerEndpointBuilder clearHeaders(Boolean clearHeaders) {
             doSetProperty("clearHeaders", clearHeaders);
@@ -140,7 +140,7 @@ public interface XmlSignerEndpointBuilderFactory {
          * type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlSignerEndpointBuilder clearHeaders(String clearHeaders) {
             doSetProperty("clearHeaders", clearHeaders);
@@ -203,7 +203,7 @@ public interface XmlSignerEndpointBuilderFactory {
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlSignerEndpointBuilder cryptoContextProperties(
                 Map<String, Object> cryptoContextProperties) {
@@ -224,7 +224,7 @@ public interface XmlSignerEndpointBuilderFactory {
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
          * type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlSignerEndpointBuilder cryptoContextProperties(
                 String cryptoContextProperties) {
@@ -253,7 +253,7 @@ public interface XmlSignerEndpointBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlSignerEndpointBuilder disallowDoctypeDecl(
                 Boolean disallowDoctypeDecl) {
@@ -268,7 +268,7 @@ public interface XmlSignerEndpointBuilderFactory {
          * type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlSignerEndpointBuilder disallowDoctypeDecl(
                 String disallowDoctypeDecl) {
@@ -312,50 +312,6 @@ public interface XmlSignerEndpointBuilderFactory {
             return this;
         }
         /**
-         * Indicator whether the XML declaration in the outgoing message body
-         * should be omitted. Default value is false. Can be overwritten by the
-         * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
-         * 
-         * The option is a: <code>java.lang.Boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         */
-        default XmlSignerEndpointBuilder omitXmlDeclaration(
-                Boolean omitXmlDeclaration) {
-            doSetProperty("omitXmlDeclaration", omitXmlDeclaration);
-            return this;
-        }
-        /**
-         * Indicator whether the XML declaration in the outgoing message body
-         * should be omitted. Default value is false. Can be overwritten by the
-         * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
-         * 
-         * The option will be converted to a <code>java.lang.Boolean</code>
-         * type.
-         * 
-         * Default: false
-         * Group: common
-         */
-        default XmlSignerEndpointBuilder omitXmlDeclaration(
-                String omitXmlDeclaration) {
-            doSetProperty("omitXmlDeclaration", omitXmlDeclaration);
-            return this;
-        }
-        /**
-         * The character encoding of the resulting signed XML document. If null
-         * then the encoding of the original XML document is used.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default XmlSignerEndpointBuilder outputXmlEncoding(
-                String outputXmlEncoding) {
-            doSetProperty("outputXmlEncoding", outputXmlEncoding);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -398,6 +354,50 @@ public interface XmlSignerEndpointBuilderFactory {
             return this;
         }
         /**
+         * Indicator whether the XML declaration in the outgoing message body
+         * should be omitted. Default value is false. Can be overwritten by the
+         * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
+         * 
+         * The option is a: <code>java.lang.Boolean</code> type.
+         * 
+         * Default: false
+         * Group: producer
+         */
+        default XmlSignerEndpointBuilder omitXmlDeclaration(
+                Boolean omitXmlDeclaration) {
+            doSetProperty("omitXmlDeclaration", omitXmlDeclaration);
+            return this;
+        }
+        /**
+         * Indicator whether the XML declaration in the outgoing message body
+         * should be omitted. Default value is false. Can be overwritten by the
+         * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
+         * 
+         * The option will be converted to a <code>java.lang.Boolean</code>
+         * type.
+         * 
+         * Default: false
+         * Group: producer
+         */
+        default XmlSignerEndpointBuilder omitXmlDeclaration(
+                String omitXmlDeclaration) {
+            doSetProperty("omitXmlDeclaration", omitXmlDeclaration);
+            return this;
+        }
+        /**
+         * The character encoding of the resulting signed XML document. If null
+         * then the encoding of the original XML document is used.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: producer
+         */
+        default XmlSignerEndpointBuilder outputXmlEncoding(
+                String outputXmlEncoding) {
+            doSetProperty("outputXmlEncoding", outputXmlEncoding);
+            return this;
+        }
+        /**
          * Local name of the parent element to which the XML signature element
          * will be added. Only relevant for enveloped XML signature.
          * Alternatively you can also use
@@ -569,7 +569,7 @@ public interface XmlSignerEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlSignerEndpointBuilder schemaResourceUri(
                 String schemaResourceUri) {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/XmlVerifierEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/XmlVerifierEndpointBuilderFactory.java
index ba0af05..4385150 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/XmlVerifierEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/XmlVerifierEndpointBuilderFactory.java
@@ -46,7 +46,7 @@ public interface XmlVerifierEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlVerifierEndpointBuilder baseUri(String baseUri) {
             doSetProperty("baseUri", baseUri);
@@ -59,7 +59,7 @@ public interface XmlVerifierEndpointBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlVerifierEndpointBuilder clearHeaders(Boolean clearHeaders) {
             doSetProperty("clearHeaders", clearHeaders);
@@ -73,7 +73,7 @@ public interface XmlVerifierEndpointBuilderFactory {
          * type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlVerifierEndpointBuilder clearHeaders(String clearHeaders) {
             doSetProperty("clearHeaders", clearHeaders);
@@ -92,7 +92,7 @@ public interface XmlVerifierEndpointBuilderFactory {
          * The option is a: <code>java.util.Map&lt;java.lang.String,
          * java.lang.Object&gt;</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlVerifierEndpointBuilder cryptoContextProperties(
                 Map<String, Object> cryptoContextProperties) {
@@ -113,7 +113,7 @@ public interface XmlVerifierEndpointBuilderFactory {
          * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
          * type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlVerifierEndpointBuilder cryptoContextProperties(
                 String cryptoContextProperties) {
@@ -127,7 +127,7 @@ public interface XmlVerifierEndpointBuilderFactory {
          * The option is a: <code>java.lang.Boolean</code> type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlVerifierEndpointBuilder disallowDoctypeDecl(
                 Boolean disallowDoctypeDecl) {
@@ -142,7 +142,7 @@ public interface XmlVerifierEndpointBuilderFactory {
          * type.
          * 
          * Default: true
-         * Group: common
+         * Group: producer
          */
         default XmlVerifierEndpointBuilder disallowDoctypeDecl(
                 String disallowDoctypeDecl) {
@@ -173,37 +173,6 @@ public interface XmlVerifierEndpointBuilderFactory {
             return this;
         }
         /**
-         * Indicator whether the XML declaration in the outgoing message body
-         * should be omitted. Default value is false. Can be overwritten by the
-         * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
-         * 
-         * The option is a: <code>java.lang.Boolean</code> type.
-         * 
-         * Default: false
-         * Group: common
-         */
-        default XmlVerifierEndpointBuilder omitXmlDeclaration(
-                Boolean omitXmlDeclaration) {
-            doSetProperty("omitXmlDeclaration", omitXmlDeclaration);
-            return this;
-        }
-        /**
-         * Indicator whether the XML declaration in the outgoing message body
-         * should be omitted. Default value is false. Can be overwritten by the
-         * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
-         * 
-         * The option will be converted to a <code>java.lang.Boolean</code>
-         * type.
-         * 
-         * Default: false
-         * Group: common
-         */
-        default XmlVerifierEndpointBuilder omitXmlDeclaration(
-                String omitXmlDeclaration) {
-            doSetProperty("omitXmlDeclaration", omitXmlDeclaration);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -246,6 +215,37 @@ public interface XmlVerifierEndpointBuilderFactory {
             return this;
         }
         /**
+         * Indicator whether the XML declaration in the outgoing message body
+         * should be omitted. Default value is false. Can be overwritten by the
+         * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
+         * 
+         * The option is a: <code>java.lang.Boolean</code> type.
+         * 
+         * Default: false
+         * Group: producer
+         */
+        default XmlVerifierEndpointBuilder omitXmlDeclaration(
+                Boolean omitXmlDeclaration) {
+            doSetProperty("omitXmlDeclaration", omitXmlDeclaration);
+            return this;
+        }
+        /**
+         * Indicator whether the XML declaration in the outgoing message body
+         * should be omitted. Default value is false. Can be overwritten by the
+         * header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION.
+         * 
+         * The option will be converted to a <code>java.lang.Boolean</code>
+         * type.
+         * 
+         * Default: false
+         * Group: producer
+         */
+        default XmlVerifierEndpointBuilder omitXmlDeclaration(
+                String omitXmlDeclaration) {
+            doSetProperty("omitXmlDeclaration", omitXmlDeclaration);
+            return this;
+        }
+        /**
          * Sets the output node search value for determining the node from the
          * XML signature document which shall be set to the output message body.
          * The class of the value depends on the type of the output node search.
@@ -297,7 +297,7 @@ public interface XmlVerifierEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlVerifierEndpointBuilder outputXmlEncoding(
                 String outputXmlEncoding) {
@@ -355,7 +355,7 @@ public interface XmlVerifierEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: producer
          */
         default XmlVerifierEndpointBuilder schemaResourceUri(
                 String schemaResourceUri) {
diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc b/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc
index 7c1c895..b3b6012 100644
--- a/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc
+++ b/docs/components/modules/ROOT/pages/xmlsecurity-sign-component.adoc
@@ -242,19 +242,19 @@ The XML Security Sign component supports 29 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *addKeyInfoReference* (producer) | In order to protect the KeyInfo element from tampering you can add a reference to the signed info element so that it is protected via the signature value. The default value is true. Only relevant when a KeyInfo is returned by KeyAccessor. and KeyInfo#getId() is not null. | true | Boolean
-| *baseUri* (common) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
+| *baseUri* (producer) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
 | *canonicalizationMethod* (producer) | Canonicalization method used to canonicalize the SignedInfo element before the digest is calculated. You can use the helper methods XmlSignatureHelper.getCanonicalizationMethod(String algorithm) or getCanonicalizationMethod(String algorithm, List inclusiveNamespacePrefixes) to create a canonicalization method. | http://www.w3.org/TR/2001/REC-xml-c14n-20010315 | AlgorithmMethod
-| *clearHeaders* (common) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
+| *clearHeaders* (producer) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
 | *contentObjectId* (producer) | Sets the content object Id attribute value. By default a UUID is generated. If you set the null value, then a new UUID will be generated. Only used in the enveloping case. |  | String
 | *contentReferenceType* (producer) | Type of the content reference. The default value is null. This value can be overwritten by the header XmlSignatureConstants#HEADER_CONTENT_REFERENCE_TYPE. |  | String
 | *contentReferenceUri* (producer) | Reference URI for the content to be signed. Only used in the enveloped case. If the reference URI contains an ID attribute value, then the resource schema URI ( setSchemaResourceUri(String)) must also be set because the schema validator will then find out which attributes are ID attributes. Will be ignored in the enveloping or detached case. |  | String
-| *cryptoContextProperties* (common) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
+| *cryptoContextProperties* (producer) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
 | *digestAlgorithm* (producer) | Digest algorithm URI. Optional parameter. This digest algorithm is used for calculating the digest of the input message. If this digest algorithm is not specified then the digest algorithm is calculated from the signature algorithm. Example: \http://www.w3.org/2001/04/xmlenc#sha256 |  | String
-| *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
+| *disallowDoctypeDecl* (producer) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keyAccessor* (producer) | For the signing process, a private key is necessary. You specify a key accessor bean which provides this private key. The key accessor bean must implement the KeyAccessor interface. The package org.apache.camel.component.xmlsecurity.api contains the default implementation class DefaultKeyAccessor which reads the private key from a Java keystore. |  | KeyAccessor
-| *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
-| *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *omitXmlDeclaration* (producer) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
+| *outputXmlEncoding* (producer) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *parentLocalName* (producer) | Local name of the parent element to which the XML signature element will be added. Only relevant for enveloped XML signature. Alternatively you can also use setParentXpath(XPathFilterParameterSpec). Default value is null. The value must be null for enveloping and detached XML signature. This parameter or the parameter setParentXpath(XPathFilterParameterSpec) for enveloped signature and the parameter setXpathsToIdAttributes(List) for detached signature mus [...]
 | *parentNamespace* (producer) | Namespace of the parent element to which the XML signature element will be added. |  | String
 | *parentXpath* (producer) | Sets the XPath to find the parent node in the enveloped case. Either you specify the parent node via this method or the local name and namespace of the parent with the methods setParentLocalName(String) and setParentNamespace(String). Default value is null. The value must be null for enveloping and detached XML signature. If the parameters parentXpath and parentLocalName are specified in the same configuration then an exception is thrown. |  | XPathFilterPara [...]
@@ -262,7 +262,7 @@ The XML Security Sign component supports 29 options, which are listed below.
 | *plainTextEncoding* (producer) | Encoding of the plain text. Only relevant if the message body is plain text (see parameter plainText. Default value is UTF-8. | UTF-8 | String
 | *prefixForXmlSignatureNamespace* (producer) | Namespace prefix for the XML signature namespace \http://www.w3.org/2000/09/xmldsig#. Default value is ds. If null or an empty value is set then no prefix is used for the XML signature namespace. See best practice \http://www.w3.org/TR/xmldsig-bestpractices/#signing-xml- without-namespaces | ds | String
 | *properties* (producer) | For adding additional References and Objects to the XML signature which contain additional properties, you can provide a bean which implements the XmlSignatureProperties interface. |  | XmlSignatureProperties
-| *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
+| *schemaResourceUri* (producer) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
 | *signatureAlgorithm* (producer) | Signature algorithm. Default value is \http://www.w3.org/2000/09/xmldsig#rsa-sha1. | http://www.w3.org/2001/04/xmldsig-more#rsa-sha256 | String
 | *signatureId* (producer) | Sets the signature Id. If this parameter is not set (null value) then a unique ID is generated for the signature ID (default). If this parameter is set to (empty string) then no Id attribute is created in the signature element. |  | String
 | *transformMethods* (producer) | Transforms which are executed on the message body before the digest is calculated. By default, C14n is added and in the case of enveloped signature (see option parentLocalName) also \http://www.w3.org/2000/09/xmldsig#enveloped-signature is added at position 0 of the list. Use methods in XmlSignatureHelper to create the transform methods. |  | List
@@ -307,19 +307,19 @@ with the following path and query parameters:
 |===
 | Name | Description | Default | Type
 | *addKeyInfoReference* (producer) | In order to protect the KeyInfo element from tampering you can add a reference to the signed info element so that it is protected via the signature value. The default value is true. Only relevant when a KeyInfo is returned by KeyAccessor. and KeyInfo#getId() is not null. | true | Boolean
-| *baseUri* (common) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
+| *baseUri* (producer) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
 | *canonicalizationMethod* (producer) | Canonicalization method used to canonicalize the SignedInfo element before the digest is calculated. You can use the helper methods XmlSignatureHelper.getCanonicalizationMethod(String algorithm) or getCanonicalizationMethod(String algorithm, List inclusiveNamespacePrefixes) to create a canonicalization method. | http://www.w3.org/TR/2001/REC-xml-c14n-20010315 | AlgorithmMethod
-| *clearHeaders* (common) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
+| *clearHeaders* (producer) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
 | *contentObjectId* (producer) | Sets the content object Id attribute value. By default a UUID is generated. If you set the null value, then a new UUID will be generated. Only used in the enveloping case. |  | String
 | *contentReferenceType* (producer) | Type of the content reference. The default value is null. This value can be overwritten by the header XmlSignatureConstants#HEADER_CONTENT_REFERENCE_TYPE. |  | String
 | *contentReferenceUri* (producer) | Reference URI for the content to be signed. Only used in the enveloped case. If the reference URI contains an ID attribute value, then the resource schema URI ( setSchemaResourceUri(String)) must also be set because the schema validator will then find out which attributes are ID attributes. Will be ignored in the enveloping or detached case. |  | String
-| *cryptoContextProperties* (common) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
+| *cryptoContextProperties* (producer) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
 | *digestAlgorithm* (producer) | Digest algorithm URI. Optional parameter. This digest algorithm is used for calculating the digest of the input message. If this digest algorithm is not specified then the digest algorithm is calculated from the signature algorithm. Example: \http://www.w3.org/2001/04/xmlenc#sha256 |  | String
-| *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
+| *disallowDoctypeDecl* (producer) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keyAccessor* (producer) | For the signing process, a private key is necessary. You specify a key accessor bean which provides this private key. The key accessor bean must implement the KeyAccessor interface. The package org.apache.camel.component.xmlsecurity.api contains the default implementation class DefaultKeyAccessor which reads the private key from a Java keystore. |  | KeyAccessor
-| *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
-| *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *omitXmlDeclaration* (producer) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
+| *outputXmlEncoding* (producer) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *parentLocalName* (producer) | Local name of the parent element to which the XML signature element will be added. Only relevant for enveloped XML signature. Alternatively you can also use setParentXpath(XPathFilterParameterSpec). Default value is null. The value must be null for enveloping and detached XML signature. This parameter or the parameter setParentXpath(XPathFilterParameterSpec) for enveloped signature and the parameter setXpathsToIdAttributes(List) for detached signature mus [...]
 | *parentNamespace* (producer) | Namespace of the parent element to which the XML signature element will be added. |  | String
 | *parentXpath* (producer) | Sets the XPath to find the parent node in the enveloped case. Either you specify the parent node via this method or the local name and namespace of the parent with the methods setParentLocalName(String) and setParentNamespace(String). Default value is null. The value must be null for enveloping and detached XML signature. If the parameters parentXpath and parentLocalName are specified in the same configuration then an exception is thrown. |  | XPathFilterPara [...]
@@ -327,7 +327,7 @@ with the following path and query parameters:
 | *plainTextEncoding* (producer) | Encoding of the plain text. Only relevant if the message body is plain text (see parameter plainText. Default value is UTF-8. | UTF-8 | String
 | *prefixForXmlSignatureNamespace* (producer) | Namespace prefix for the XML signature namespace \http://www.w3.org/2000/09/xmldsig#. Default value is ds. If null or an empty value is set then no prefix is used for the XML signature namespace. See best practice \http://www.w3.org/TR/xmldsig-bestpractices/#signing-xml- without-namespaces | ds | String
 | *properties* (producer) | For adding additional References and Objects to the XML signature which contain additional properties, you can provide a bean which implements the XmlSignatureProperties interface. |  | XmlSignatureProperties
-| *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
+| *schemaResourceUri* (producer) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
 | *signatureAlgorithm* (producer) | Signature algorithm. Default value is \http://www.w3.org/2000/09/xmldsig#rsa-sha1. | http://www.w3.org/2001/04/xmldsig-more#rsa-sha256 | String
 | *signatureId* (producer) | Sets the signature Id. If this parameter is not set (null value) then a unique ID is generated for the signature ID (default). If this parameter is set to (empty string) then no Id attribute is created in the signature element. |  | String
 | *transformMethods* (producer) | Transforms which are executed on the message body before the digest is calculated. By default, C14n is added and in the case of enveloped signature (see option parentLocalName) also \http://www.w3.org/2000/09/xmldsig#enveloped-signature is added at position 0 of the list. Use methods in XmlSignatureHelper to create the transform methods. |  | List
diff --git a/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc b/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
index 74ca1a1..0286335 100644
--- a/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
+++ b/docs/components/modules/ROOT/pages/xmlsecurity-verify-component.adoc
@@ -241,18 +241,18 @@ The XML Security Verify component supports 19 options, which are listed below.
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *baseUri* (common) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
-| *clearHeaders* (common) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
-| *cryptoContextProperties* (common) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
-| *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
+| *baseUri* (producer) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
+| *clearHeaders* (producer) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
+| *cryptoContextProperties* (producer) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
+| *disallowDoctypeDecl* (producer) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keySelector* (producer) | Provides the key for validating the XML signature. |  | KeySelector
-| *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
+| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *omitXmlDeclaration* (producer) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
 | *outputNodeSearch* (producer) | Sets the output node search value for determining the node from the XML signature document which shall be set to the output message body. The class of the value depends on the type of the output node search. The output node search is forwarded to XmlSignature2Message. |  | Object
 | *outputNodeSearchType* (producer) | Determines the search type for determining the output node which is serialized into the output message bodyF. See setOutputNodeSearch(Object). The supported default search types you can find in DefaultXmlSignature2Message. | Default | String
-| *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
+| *outputXmlEncoding* (producer) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *removeSignatureElements* (producer) | Indicator whether the XML signature elements (elements with local name Signature and namesapce \http://www.w3.org/2000/09/xmldsig#) shall be removed from the document set to the output message. Normally, this is only necessary, if the XML signature is enveloped. The default value is Boolean#FALSE. This parameter is forwarded to XmlSignature2Message. This indicator has no effect if the output node search is of type DefaultXmlSignature2Message#OUTPU [...]
-| *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
-| *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *schemaResourceUri* (producer) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
 | *secureValidation* (producer) | Enables secure validation. If true then secure validation is enabled. | true | Boolean
 | *validationFailedHandler* (producer) | Handles the different validation failed situations. The default implementation throws specific exceptions for the different situations (All exceptions have the package name org.apache.camel.component.xmlsecurity.api and are a sub-class of XmlSignatureInvalidException. If the signature value validation fails, a XmlSignatureInvalidValueException is thrown. If a reference validation fails, a XmlSignatureInvalidContentHashException is thrown. For more [...]
 | *xmlSignature2Message* (producer) | Bean which maps the XML signature to the output-message after the validation. How this mapping should be done can be configured by the options outputNodeSearchType, outputNodeSearch, and removeSignatureElements. The default implementation offers three possibilities which are related to the three output node search types Default, ElementName, and XPath. The default implementation determines a node which is then serialized and set to the body of the ou [...]
@@ -296,18 +296,18 @@ with the following path and query parameters:
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
-| *baseUri* (common) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
-| *clearHeaders* (common) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
-| *cryptoContextProperties* (common) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
-| *disallowDoctypeDecl* (common) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
+| *baseUri* (producer) | You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI. |  | String
+| *clearHeaders* (producer) | Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true. | true | Boolean
+| *cryptoContextProperties* (producer) | Sets the crypto context properties. See {link XMLCryptoContext#setProperty(String, Object)}. Possible properties are defined in XMLSignContext an XMLValidateContext (see Supported Properties). The following properties are set by default to the value Boolean#TRUE for the XML validation. If you want to switch these features off you must set the property value to Boolean#FALSE. org.jcp.xml.dsig.validateManifests javax.xml.crypto.dsig.cacheReference |  | Map
+| *disallowDoctypeDecl* (producer) | Disallows that the incoming XML document contains DTD DOCTYPE declaration. The default value is Boolean#TRUE. | true | Boolean
 | *keySelector* (producer) | Provides the key for validating the XML signature. |  | KeySelector
-| *omitXmlDeclaration* (common) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
+| *omitXmlDeclaration* (producer) | Indicator whether the XML declaration in the outgoing message body should be omitted. Default value is false. Can be overwritten by the header XmlSignatureConstants#HEADER_OMIT_XML_DECLARATION. | false | Boolean
 | *outputNodeSearch* (producer) | Sets the output node search value for determining the node from the XML signature document which shall be set to the output message body. The class of the value depends on the type of the output node search. The output node search is forwarded to XmlSignature2Message. |  | Object
 | *outputNodeSearchType* (producer) | Determines the search type for determining the output node which is serialized into the output message bodyF. See setOutputNodeSearch(Object). The supported default search types you can find in DefaultXmlSignature2Message. | Default | String
-| *outputXmlEncoding* (common) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
+| *outputXmlEncoding* (producer) | The character encoding of the resulting signed XML document. If null then the encoding of the original XML document is used. |  | String
 | *removeSignatureElements* (producer) | Indicator whether the XML signature elements (elements with local name Signature and namesapce \http://www.w3.org/2000/09/xmldsig#) shall be removed from the document set to the output message. Normally, this is only necessary, if the XML signature is enveloped. The default value is Boolean#FALSE. This parameter is forwarded to XmlSignature2Message. This indicator has no effect if the output node search is of type DefaultXmlSignature2Message#OUTPU [...]
-| *schemaResourceUri* (common) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
+| *schemaResourceUri* (producer) | Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID attributes, might be set in the enveloped and enveloping case. If set, then the XML document is validated with the specified XML schema. The schema resource URI can be overwritten by the header XmlSignatureConstants#HEADER_SCHEMA_RESOURCE_URI. |  | String
 | *secureValidation* (producer) | Enables secure validation. If true then secure validation is enabled. | true | Boolean
 | *validationFailedHandler* (producer) | Handles the different validation failed situations. The default implementation throws specific exceptions for the different situations (All exceptions have the package name org.apache.camel.component.xmlsecurity.api and are a sub-class of XmlSignatureInvalidException. If the signature value validation fails, a XmlSignatureInvalidValueException is thrown. If a reference validation fails, a XmlSignatureInvalidContentHashException is thrown. For more [...]
 | *xmlSignature2Message* (producer) | Bean which maps the XML signature to the output-message after the validation. How this mapping should be done can be configured by the options outputNodeSearchType, outputNodeSearch, and removeSignatureElements. The default implementation offers three possibilities which are related to the three output node search types Default, ElementName, and XPath. The default implementation determines a node which is then serialized and set to the body of the ou [...]
diff --git a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
index 3eaad08..de881ef 100644
--- a/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
+++ b/tooling/maven/camel-package-maven-plugin/src/test/java/org/apache/camel/maven/packaging/EndpointHelperTest.java
@@ -19,8 +19,10 @@ package org.apache.camel.maven.packaging;
 import java.io.File;
 import java.io.IOException;
 import java.util.Objects;
+import java.util.stream.Collectors;
 
 import org.apache.camel.tooling.model.ComponentModel;
+import org.apache.camel.tooling.model.ComponentModel.ComponentOptionModel;
 import org.apache.camel.tooling.model.JsonMapper;
 import org.apache.camel.tooling.util.PackageHelper;
 import org.junit.jupiter.api.Test;
@@ -30,18 +32,32 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 public class EndpointHelperTest {
 
     @Test
-    public void testIfCreateJavaClassCorrectly() throws IOException {
+    public void testSort1() throws IOException {
         final String json = PackageHelper.loadText(new File(Objects.requireNonNull(getClass().getClassLoader().getResource("json/test_component3.json")).getFile()));
         final ComponentModel componentModel = JsonMapper.generateComponentModel(json);
 
         componentModel.getComponentOptions().sort(EndpointHelper.createGroupAndLabelComparator());
 
-        assertEquals("schemaRegistryURL", componentModel.getComponentOptions().get(0).getName());
-        assertEquals("sslTrustmanagerAlgorithm", componentModel.getComponentOptions().get(1).getName());
-        assertEquals("sslTruststoreLocation", componentModel.getComponentOptions().get(2).getName());
-        assertEquals("sslTruststorePassword", componentModel.getComponentOptions().get(3).getName());
-        assertEquals("sslTruststoreType", componentModel.getComponentOptions().get(4).getName());
-        assertEquals("useGlobalSslContextParameters", componentModel.getComponentOptions().get(5).getName());
+        assertEquals("schemaRegistryURL,sslTrustmanagerAlgorithm,sslTruststoreLocation,sslTruststorePassword," +
+                        "sslTruststoreType,useGlobalSslContextParameters",
+                componentModel.getComponentOptions().stream()
+                    .map(ComponentOptionModel::getName).collect(Collectors.joining(",")));
+    }
+
+    @Test
+    public void testSort2() throws IOException {
+        final String json = PackageHelper.loadText(new File(Objects.requireNonNull(getClass().getClassLoader().getResource("json/test_component4.json")).getFile()));
+        final ComponentModel componentModel = JsonMapper.generateComponentModel(json);
+
+        componentModel.getComponentOptions().sort(EndpointHelper.createGroupAndLabelComparator());
+
+        assertEquals("baseUri,clearHeaders,cryptoContextProperties,disallowDoctypeDecl," +
+                        "keySelector,omitXmlDeclaration,lazyStartProducer,outputNodeSearch,outputNodeSearchType," +
+                        "outputXmlEncoding,removeSignatureElements,schemaResourceUri,secureValidation," +
+                        "validationFailedHandler,xmlSignature2Message,xmlSignatureChecker,basicPropertyBinding," +
+                        "uriDereferencer,verifierConfiguration",
+                componentModel.getComponentOptions().stream()
+                        .map(ComponentOptionModel::getName).collect(Collectors.joining(",")));
     }
 
 }
diff --git a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component4.json
similarity index 50%
copy from components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json
copy to tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component4.json
index a61e320..64b793b 100644
--- a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-verify.json
+++ b/tooling/maven/camel-package-maven-plugin/src/test/resources/json/test_component4.json
@@ -25,12 +25,12 @@
     "disallowDoctypeDecl": { "kind": "property", "displayName": "Disallow Doctype Decl", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declarat [...]
     "keySelector": { "kind": "property", "displayName": "Key Selector", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.xml.crypto.KeySelector", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Provides the key for validating the XML signature." },
     "omitXmlDeclaration": { "kind": "property", "displayName": "Omit Xml Declaration", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Indicator whether the XML declaration in the outgoing message body shou [...]
+    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
     "outputNodeSearch": { "kind": "property", "displayName": "Output Node Search", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Sets the output node search value for determining the node from the XML signature document which shall be  [...]
     "outputNodeSearchType": { "kind": "property", "displayName": "Output Node Search Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Default", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Determines the search type for determining the output node which is se [...]
     "outputXmlEncoding": { "kind": "property", "displayName": "Output Xml Encoding", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the origin [...]
     "removeSignatureElements": { "kind": "property", "displayName": "Remove Signature Elements", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Indicator whether the XML signature elements (elements with local [...]
     "schemaResourceUri": { "kind": "property", "displayName": "Schema Resource Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining th [...]
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
     "secureValidation": { "kind": "property", "displayName": "Secure Validation", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Enables secure validation. If true then secure validation is enabled." },
     "validationFailedHandler": { "kind": "property", "displayName": "Validation Failed Handler", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Handles the different validation failed si [...]
     "xmlSignature2Message": { "kind": "property", "displayName": "Xml Signature2 Message", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.XmlSignature2Message", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "Bean which maps the XML signature to the output-mes [...]
@@ -38,27 +38,5 @@
     "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
     "uriDereferencer": { "kind": "property", "displayName": "Uri Dereferencer", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.xml.crypto.URIDereferencer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "verifierConfiguration", "description": "If you want to restrict the remote access via reference URIs, you can set an own dere [...]
     "verifierConfiguration": { "kind": "property", "displayName": "Verifier Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "deprecated": false, "secret": false, "description": "To use a shared XmlVerifierConfiguration configuration to use as base for configuring endpoints." }
-  },
-  "properties": {
-    "name": { "kind": "path", "displayName": "Name", "group": "producer", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The name part in the URI can be chosen by the user to distinguish between different verify endpoints within the camel context." },
-    "baseUri": { "kind": "parameter", "displayName": "Base Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI." },
-    "clearHeaders": { "kind": "parameter", "displayName": "Clear Headers", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Determines if the XML signature specific headers be cleared after signing and verification.  [...]
-    "cryptoContextProperties": { "kind": "parameter", "displayName": "Crypto Context Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Sets the crypto context properties. See {link XMLCryptoContext [...]
-    "disallowDoctypeDecl": { "kind": "parameter", "displayName": "Disallow Doctype Decl", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Disallows that the incoming XML document contains DTD DOCTYPE declaration. Th [...]
-    "keySelector": { "kind": "parameter", "displayName": "Key Selector", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "javax.xml.crypto.KeySelector", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Provides the key for validating the XML signature." },
-    "omitXmlDeclaration": { "kind": "parameter", "displayName": "Omit Xml Declaration", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Indicator whether the XML declaration in the outgoing message body should be o [...]
-    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
-    "outputNodeSearch": { "kind": "parameter", "displayName": "Output Node Search", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Sets the output node search value for determining the node from the XML signature document which shall be set to  [...]
-    "outputNodeSearchType": { "kind": "parameter", "displayName": "Output Node Search Type", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Default", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Determines the search type for determining the output node which is serialize [...]
-    "outputXmlEncoding": { "kind": "parameter", "displayName": "Output Xml Encoding", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "The character encoding of the resulting signed XML document. If null then the encoding of the original XML  [...]
-    "removeSignatureElements": { "kind": "parameter", "displayName": "Remove Signature Elements", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Indicator whether the XML signature elements (elements with local name S [...]
-    "schemaResourceUri": { "kind": "parameter", "displayName": "Schema Resource Uri", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Classpath to the XML Schema. Must be specified in the detached XML Signature case for determining the ID at [...]
-    "secureValidation": { "kind": "parameter", "displayName": "Secure Validation", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Enables secure validation. If true then secure validation is enabled." },
-    "validationFailedHandler": { "kind": "parameter", "displayName": "Validation Failed Handler", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.ValidationFailedHandler", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Handles the different validation failed situation [...]
-    "xmlSignature2Message": { "kind": "parameter", "displayName": "Xml Signature2 Message", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.XmlSignature2Message", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "Bean which maps the XML signature to the output-message af [...]
-    "xmlSignatureChecker": { "kind": "parameter", "displayName": "Xml Signature Checker", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.api.XmlSignatureChecker", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "This interface allows the application to check the XML signat [...]
-    "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
-    "uriDereferencer": { "kind": "parameter", "displayName": "Uri Dereferencer", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.xml.crypto.URIDereferencer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xmlsecurity.processor.XmlVerifierConfiguration", "configurationField": "configuration", "description": "If you want to restrict the remote access via reference URIs, you can set an own dereference [...]
   }
 }


[camel] 12/18: Fix rabbitmq doc and regen

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

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

commit 88bf36b2adef49e3d52faa3d8cb2594db7dbc8ef
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 20:27:08 2020 +0100

    Fix rabbitmq doc and regen
---
 .../apache/camel/component/rabbitmq/rabbitmq.json  |  2 +-
 .../src/main/docs/rabbitmq-component.adoc          |  2 +-
 .../dsl/RabbitMQEndpointBuilderFactory.java        | 12 +++++++
 .../modules/ROOT/pages/rabbitmq-component.adoc     |  2 +-
 .../apache/camel/tooling/util/JavadocHelper.java   | 38 +++++++++++-----------
 5 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/components/camel-rabbitmq/src/generated/resources/org/apache/camel/component/rabbitmq/rabbitmq.json b/components/camel-rabbitmq/src/generated/resources/org/apache/camel/component/rabbitmq/rabbitmq.json
index d24dc1d..f3aca78 100644
--- a/components/camel-rabbitmq/src/generated/resources/org/apache/camel/component/rabbitmq/rabbitmq.json
+++ b/components/camel-rabbitmq/src/generated/resources/org/apache/camel/component/rabbitmq/rabbitmq.json
@@ -111,7 +111,7 @@
     "bridgeEndpoint": { "kind": "parameter", "displayName": "Bridge Endpoint", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the bridgeEndpoint is true, the producer will ignore the message header of rabbitmq.EXCHANGE_NAME and rabbitmq.ROUTING_KEY" },
     "channelPoolMaxSize": { "kind": "parameter", "displayName": "Channel Pool Max Size", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": "10", "description": "Get maximum number of opened channel in pool" },
     "channelPoolMaxWait": { "kind": "parameter", "displayName": "Channel Pool Max Wait", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": "1000", "description": "Set the maximum number of milliseconds to wait for a channel from the pool" },
-    "guaranteedDeliveries": { "kind": "parameter", "displayName": "Guaranteed Deliveries", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "When true, an exception will be thrown when the message cannot be delivered (basic.return) and the message is marked as mandatory. PublisherAcknowledgement will also be activated in this case. See also a href=https:\/\/ww [...]
+    "guaranteedDeliveries": { "kind": "parameter", "displayName": "Guaranteed Deliveries", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "When true, an exception will be thrown when the message cannot be delivered (basic.return) and the message is marked as mandatory. PublisherAcknowledgement will also be activated in this case. See also publisher acknowled [...]
     "immediate": { "kind": "parameter", "displayName": "Immediate", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "This flag tells the server how to react if the message cannot be routed to a queue consumer immediately. If this flag is set, the server will return an undeliverable message with a Return method. If this flag is zero, the server will queue the  [...]
     "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
     "mandatory": { "kind": "parameter", "displayName": "Mandatory", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "This flag tells the server how to react if the message cannot be routed to a queue. If this flag is set, the server will return an unroutable message with a Return method. If this flag is zero, the server silently drops the message. If the head [...]
diff --git a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
index eb15201..29ef17b 100644
--- a/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
+++ b/components/camel-rabbitmq/src/main/docs/rabbitmq-component.adoc
@@ -176,7 +176,7 @@ with the following path and query parameters:
 | *bridgeEndpoint* (producer) | If the bridgeEndpoint is true, the producer will ignore the message header of rabbitmq.EXCHANGE_NAME and rabbitmq.ROUTING_KEY | false | boolean
 | *channelPoolMaxSize* (producer) | Get maximum number of opened channel in pool | 10 | int
 | *channelPoolMaxWait* (producer) | Set the maximum number of milliseconds to wait for a channel from the pool | 1000 | long
-| *guaranteedDeliveries* (producer) | When true, an exception will be thrown when the message cannot be delivered (basic.return) and the message is marked as mandatory. PublisherAcknowledgement will also be activated in this case. See also a href=\https://www.rabbitmq.com/confirms.htmlpublisher acknowledgements - When will messages be confirmed. | false | boolean
+| *guaranteedDeliveries* (producer) | When true, an exception will be thrown when the message cannot be delivered (basic.return) and the message is marked as mandatory. PublisherAcknowledgement will also be activated in this case. See also publisher acknowledgements - When will messages be confirmed. | false | boolean
 | *immediate* (producer) | This flag tells the server how to react if the message cannot be routed to a queue consumer immediately. If this flag is set, the server will return an undeliverable message with a Return method. If this flag is zero, the server will queue the message, but with no guarantee that it will ever be consumed. If the header is present rabbitmq.IMMEDIATE it will override this option. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *mandatory* (producer) | This flag tells the server how to react if the message cannot be routed to a queue. If this flag is set, the server will return an unroutable message with a Return method. If this flag is zero, the server silently drops the message. If the header is present rabbitmq.MANDATORY it will override this option. | false | boolean
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java
index 8083182..cca0f53 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/RabbitMQEndpointBuilderFactory.java
@@ -555,6 +555,18 @@ public interface RabbitMQEndpointBuilderFactory {
             return this;
         }
         /**
+         * Specify a client-generated consumer tag to establish context when
+         * invoking the consume operation.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: consumer
+         */
+        default RabbitMQEndpointConsumerBuilder consumerTag(String consumerTag) {
+            doSetProperty("consumerTag", consumerTag);
+            return this;
+        }
+        /**
          * Request exclusive access to the queue (meaning only this consumer can
          * access the queue). This is useful when you want a long-lived shared
          * queue to be temporarily accessible by just one consumer.
diff --git a/docs/components/modules/ROOT/pages/rabbitmq-component.adoc b/docs/components/modules/ROOT/pages/rabbitmq-component.adoc
index 4d50a41..f0dedb1 100644
--- a/docs/components/modules/ROOT/pages/rabbitmq-component.adoc
+++ b/docs/components/modules/ROOT/pages/rabbitmq-component.adoc
@@ -177,7 +177,7 @@ with the following path and query parameters:
 | *bridgeEndpoint* (producer) | If the bridgeEndpoint is true, the producer will ignore the message header of rabbitmq.EXCHANGE_NAME and rabbitmq.ROUTING_KEY | false | boolean
 | *channelPoolMaxSize* (producer) | Get maximum number of opened channel in pool | 10 | int
 | *channelPoolMaxWait* (producer) | Set the maximum number of milliseconds to wait for a channel from the pool | 1000 | long
-| *guaranteedDeliveries* (producer) | When true, an exception will be thrown when the message cannot be delivered (basic.return) and the message is marked as mandatory. PublisherAcknowledgement will also be activated in this case. See also a href=\https://www.rabbitmq.com/confirms.htmlpublisher acknowledgements - When will messages be confirmed. | false | boolean
+| *guaranteedDeliveries* (producer) | When true, an exception will be thrown when the message cannot be delivered (basic.return) and the message is marked as mandatory. PublisherAcknowledgement will also be activated in this case. See also publisher acknowledgements - When will messages be confirmed. | false | boolean
 | *immediate* (producer) | This flag tells the server how to react if the message cannot be routed to a queue consumer immediately. If this flag is set, the server will return an undeliverable message with a Return method. If this flag is zero, the server will queue the message, but with no guarantee that it will ever be consumed. If the header is present rabbitmq.IMMEDIATE it will override this option. | false | boolean
 | *lazyStartProducer* (producer) | Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and [...]
 | *mandatory* (producer) | This flag tells the server how to react if the message cannot be routed to a queue. If this flag is set, the server will return an unroutable message with a Return method. If this flag is zero, the server silently drops the message. If the header is present rabbitmq.MANDATORY it will override this option. | false | boolean
diff --git a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
index a10fa1f..0228651 100644
--- a/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
+++ b/tooling/camel-tooling-util/src/main/java/org/apache/camel/tooling/util/JavadocHelper.java
@@ -65,31 +65,13 @@ public final class JavadocHelper {
                 continue;
             }
 
-            // remove all XML tags
-            line = line.replaceAll("<.*?>", "");
-
-            // remove all inlined javadoc links, eg such as {@link org.apache.camel.spi.Registry}
-            // use #? to remove leading # in case its a local reference
-            line = line.replaceAll("\\{\\@\\w+\\s#?([\\w.#(\\d,)]+)\\}", "$1");
-
             // we are starting from a new line, so add a whitespace
             if (!first) {
                 sb.append(' ');
             }
 
-            // create a new line
-            StringBuilder cb = new StringBuilder();
-            for (char c : line.toCharArray()) {
-                if (Character.isJavaIdentifierPart(c) || VALID_CHARS.indexOf(c) != -1) {
-                    cb.append(c);
-                } else if (Character.isWhitespace(c)) {
-                    // always use space as whitespace, also for line feeds etc
-                    cb.append(' ');
-                }
-            }
-
             // append data
-            String s = cb.toString().trim();
+            String s = line.trim();
             sb.append(s);
 
             boolean empty = isNullOrEmpty(s);
@@ -105,6 +87,24 @@ public final class JavadocHelper {
         }
 
         String s = sb.toString();
+        // remove all XML tags
+        s = s.replaceAll("<.*?>", "");
+        // remove all inlined javadoc links, eg such as {@link org.apache.camel.spi.Registry}
+        // use #? to remove leading # in case its a local reference
+        s = s.replaceAll("\\{\\@\\w+\\s#?([\\w.#(\\d,)]+)\\}", "$1");
+
+        // create a new line
+        StringBuilder cb = new StringBuilder();
+        for (char c : s.toCharArray()) {
+            if (Character.isJavaIdentifierPart(c) || VALID_CHARS.indexOf(c) != -1) {
+                cb.append(c);
+            } else if (Character.isWhitespace(c)) {
+                // always use space as whitespace, also for line feeds etc
+                cb.append(' ');
+            }
+        }
+        s = cb.toString();
+
         // remove double whitespaces, and trim
         s = s.replaceAll("\\s+", " ");
         // unescape http links


[camel] 02/18: Full regen

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

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

commit 7e76efe231151fd0de1a45842d07cdccb8a121d4
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 15:13:09 2020 +0100

    Full regen
---
 .../services/org/apache/camel/other.properties     |    7 -
 .../src/generated/resources/dummy-component.json   |   12 -
 ...urer.java => XmlSignerComponentConfigurer.java} |    6 +-
 .../org/apache/camel/component/xmlsecurity-sign    |    2 +-
 .../camel/configurer/xmlsecurity-sign-component    |    2 +-
 .../component/xmlsecurity/xmlsecurity-sign.json    |    2 +-
 ...atureComponent.java => XmlSignerComponent.java} |  132 +-
 .../component/xmlsecurity/XmlSignerEndpoint.java   |    2 +-
 core/camel-allcomponents/pom.xml                   |    4 +
 .../services/org/apache/camel/language.properties  |    4 +-
 .../apache/camel/language/constant/constant.json   |    2 +-
 .../org/apache/camel/language/header/header.json   |    2 +-
 .../camel/language/property/exchangeProperty.json  |    2 +-
 .../org/apache/camel/language/ref/ref.json         |    2 +-
 .../org/apache/camel/language/simple/file.json     |    2 +-
 .../org/apache/camel/language/simple/simple.json   |    2 +-
 .../apache/camel/language/tokenizer/tokenize.json  |    2 +-
 .../XmlsecuritySignComponentBuilderFactory.java    |   70 +-
 .../src/generated/resources/metadata.json          |    2 +-
 .../builder/endpoint/EndpointBuilderFactory.java   |   18 +-
 .../camel/builder/endpoint/EndpointBuilders.java   |   18 +-
 .../endpoint/dsl/AMQPEndpointBuilderFactory.java   |   50 +-
 ...ory.java => AWS2EC2EndpointBuilderFactory.java} |  119 +-
 .../dsl/ActiveMQEndpointBuilderFactory.java        |   38 -
 .../dsl/AsteriskEndpointBuilderFactory.java        |    4 +-
 .../AtmosphereWebsocketEndpointBuilderFactory.java |    4 +-
 .../dsl/BeanValidatorEndpointBuilderFactory.java   |    9 +-
 .../dsl/BraintreeEndpointBuilderFactory.java       |  559 ++---
 .../endpoint/dsl/BrowseEndpointBuilderFactory.java |   12 +-
 .../endpoint/dsl/ClientEndpointBuilderFactory.java |   42 +-
 .../endpoint/dsl/CometdEndpointBuilderFactory.java |   28 +-
 .../dsl/ControlBusEndpointBuilderFactory.java      |   12 +-
 .../endpoint/dsl/CordaEndpointBuilderFactory.java  |  227 ++
 .../dsl/CryptoCmsEndpointBuilderFactory.java       |    4 +-
 ...Factory.java => Cw2EndpointBuilderFactory.java} |  233 +-
 .../endpoint/dsl/CxfRsEndpointBuilderFactory.java  |   22 +-
 .../dsl/DataSetEndpointBuilderFactory.java         |  120 +-
 .../dsl/DataSetTestEndpointBuilderFactory.java     |  128 +-
 ...actory.java => Ddb2EndpointBuilderFactory.java} |  273 ++-
 ....java => Ddb2StreamEndpointBuilderFactory.java} |  499 ++--
 .../endpoint/dsl/DirectEndpointBuilderFactory.java |    9 +-
 .../dsl/DirectVmEndpointBuilderFactory.java        |   11 +-
 .../dsl/DisruptorEndpointBuilderFactory.java       |   12 +-
 .../dsl/DisruptorVmEndpointBuilderFactory.java     |   12 +-
 .../endpoint/dsl/DockerEndpointBuilderFactory.java |   81 +
 .../endpoint/dsl/DrillEndpointBuilderFactory.java  |   12 +-
 .../endpoint/dsl/EC2EndpointBuilderFactory.java    |    8 +-
 .../endpoint/dsl/ECS2EndpointBuilderFactory.java   |   24 +-
 .../endpoint/dsl/EKS2EndpointBuilderFactory.java   |   30 +-
 .../dsl/ElasticsearchEndpointBuilderFactory.java   |   46 +
 .../dsl/ElytronEndpointBuilderFactory.java         |   90 +-
 ...ry.java => EtcdKeysEndpointBuilderFactory.java} |  257 +--
 ...y.java => EtcdStatsEndpointBuilderFactory.java} |  274 ++-
 ...y.java => EtcdWatchEndpointBuilderFactory.java} |  268 ++-
 .../dsl/FacebookEndpointBuilderFactory.java        |   16 +-
 .../endpoint/dsl/FileEndpointBuilderFactory.java   |   96 +-
 .../endpoint/dsl/FtpEndpointBuilderFactory.java    |   26 +-
 .../endpoint/dsl/FtpsEndpointBuilderFactory.java   |   62 +-
 .../endpoint/dsl/GitHubEndpointBuilderFactory.java |   50 +-
 .../dsl/GoogleBigQueryEndpointBuilderFactory.java  |   40 +-
 .../GoogleBigQuerySQLEndpointBuilderFactory.java   |   37 +-
 .../dsl/GoogleCalendarEndpointBuilderFactory.java  |  228 +-
 .../dsl/GoogleDriveEndpointBuilderFactory.java     |  228 +-
 .../dsl/GoogleMailEndpointBuilderFactory.java      |  190 +-
 .../dsl/GooglePubsubEndpointBuilderFactory.java    |  171 +-
 .../dsl/GoogleSheetsEndpointBuilderFactory.java    |  196 +-
 .../endpoint/dsl/GridFsEndpointBuilderFactory.java |   12 +-
 .../endpoint/dsl/HBaseEndpointBuilderFactory.java  |   12 +-
 .../dsl/HazelcastSedaEndpointBuilderFactory.java   |    6 +-
 .../endpoint/dsl/HttpEndpointBuilderFactory.java   |    9 +-
 ...actory.java => IAM2EndpointBuilderFactory.java} |  159 +-
 .../dsl/IgniteCacheEndpointBuilderFactory.java     |   34 +-
 .../dsl/IgniteComputeEndpointBuilderFactory.java   |   14 +-
 .../dsl/IgniteEventsEndpointBuilderFactory.java    |   12 +-
 .../dsl/IgniteIdGenEndpointBuilderFactory.java     |    6 +-
 .../dsl/IgniteMessagingEndpointBuilderFactory.java |   11 +-
 .../dsl/IgniteQueueEndpointBuilderFactory.java     |    9 +-
 .../dsl/IgniteSetEndpointBuilderFactory.java       |    9 +-
 .../endpoint/dsl/JMXEndpointBuilderFactory.java    |   26 +-
 .../endpoint/dsl/JdbcEndpointBuilderFactory.java   |    4 +-
 .../endpoint/dsl/JiraEndpointBuilderFactory.java   |   54 +-
 .../endpoint/dsl/JmsEndpointBuilderFactory.java    |  166 +-
 .../endpoint/dsl/JooqEndpointBuilderFactory.java   |   75 +
 .../endpoint/dsl/JpaEndpointBuilderFactory.java    |    4 +-
 .../endpoint/dsl/KMS2EndpointBuilderFactory.java   |   32 +-
 .../endpoint/dsl/KafkaEndpointBuilderFactory.java  |   40 +-
 ...ry.java => Kinesis2EndpointBuilderFactory.java} |  927 ++++----
 ...=> KinesisFirehose2EndpointBuilderFactory.java} |  209 +-
 .../endpoint/dsl/KuduEndpointBuilderFactory.java   |   16 +-
 ...ory.java => Lambda2EndpointBuilderFactory.java} |  252 +-
 .../dsl/LanguageEndpointBuilderFactory.java        |   20 +-
 .../endpoint/dsl/LdapEndpointBuilderFactory.java   |    8 +-
 .../endpoint/dsl/LogEndpointBuilderFactory.java    |   12 +-
 .../endpoint/dsl/MQ2EndpointBuilderFactory.java    |   26 +-
 .../endpoint/dsl/MSK2EndpointBuilderFactory.java   |   26 +-
 .../endpoint/dsl/MailEndpointBuilderFactory.java   |   95 +
 .../MicroProfileMetricsEndpointBuilderFactory.java |   36 +-
 .../endpoint/dsl/MllpEndpointBuilderFactory.java   |   17 +-
 .../endpoint/dsl/MockEndpointBuilderFactory.java   |  175 +-
 .../dsl/MongoDbEndpointBuilderFactory.java         |   24 +-
 .../dsl/MyBatisEndpointBuilderFactory.java         |    4 +-
 .../endpoint/dsl/NettyEndpointBuilderFactory.java  |   12 +-
 .../dsl/NettyHttpEndpointBuilderFactory.java       |   12 +-
 .../endpoint/dsl/NsqEndpointBuilderFactory.java    |   34 +-
 .../dsl/Olingo2EndpointBuilderFactory.java         |  504 ++--
 .../dsl/Olingo4EndpointBuilderFactory.java         |  504 ++--
 .../dsl/PgEventEndpointBuilderFactory.java         |    9 +-
 .../PgReplicationSlotEndpointBuilderFactory.java   |   16 +-
 .../dsl/PrinterEndpointBuilderFactory.java         |   20 +-
 .../endpoint/dsl/PulsarEndpointBuilderFactory.java |  155 +-
 .../dsl/RestOpenApiEndpointBuilderFactory.java     |    5 +-
 .../dsl/RestSwaggerEndpointBuilderFactory.java     |    5 +-
 .../dsl/SalesforceEndpointBuilderFactory.java      |   12 +-
 .../dsl/SchedulerEndpointBuilderFactory.java       |   13 +-
 .../endpoint/dsl/SedaEndpointBuilderFactory.java   |   24 +-
 .../endpoint/dsl/ServerEndpointBuilderFactory.java |   42 +-
 .../dsl/ServletEndpointBuilderFactory.java         |    4 +-
 ...actory.java => Ses2EndpointBuilderFactory.java} |  259 +--
 .../endpoint/dsl/SftpEndpointBuilderFactory.java   |  176 +-
 .../endpoint/dsl/Sjms2EndpointBuilderFactory.java  |   64 +-
 .../endpoint/dsl/SjmsEndpointBuilderFactory.java   |   62 +-
 ...actory.java => Sns2EndpointBuilderFactory.java} |  300 ++-
 .../endpoint/dsl/SparkEndpointBuilderFactory.java  |  387 +---
 .../endpoint/dsl/SqlEndpointBuilderFactory.java    |   34 +-
 .../endpoint/dsl/Sqs2EndpointBuilderFactory.java   | 2420 ++++++++++++++++++++
 .../endpoint/dsl/StubEndpointBuilderFactory.java   |   29 +-
 .../dsl/TelegramEndpointBuilderFactory.java        |   12 +-
 .../endpoint/dsl/TikaEndpointBuilderFactory.java   |   13 +-
 .../endpoint/dsl/TimerEndpointBuilderFactory.java  |   35 +-
 .../dsl/Translate2EndpointBuilderFactory.java      |   44 +-
 .../dsl/UndertowEndpointBuilderFactory.java        |   88 +-
 .../dsl/ValidatorEndpointBuilderFactory.java       |   28 +-
 .../dsl/WebhookEndpointBuilderFactory.java         |   92 +-
 .../dsl/WebsocketEndpointBuilderFactory.java       |    9 +-
 .../endpoint/dsl/WekaEndpointBuilderFactory.java   |    4 +-
 .../dsl/WorkdayEndpointBuilderFactory.java         |  508 +---
 ...y.java => XmlSignerEndpointBuilderFactory.java} |  852 +++----
 .../dsl/XmlVerifierEndpointBuilderFactory.java     |  673 ++++++
 .../endpoint/dsl/YammerEndpointBuilderFactory.java |   72 +
 .../camel-main-configuration-metadata.json         |    3 +-
 .../services/org/apache/camel/language.properties  |    7 -
 .../camel/converter/jaxp/DomConverterLoader.java   |   53 -
 .../camel/converter/jaxp/StaxConverterLoader.java  |   77 -
 .../jaxp/StreamSourceConverterLoader.java          |   38 -
 .../camel/converter/jaxp/XmlConverterLoader.java   |  159 --
 .../camel/language/xtokenizer/xtokenize.json       |   25 -
 .../util/xml/StreamSourceConverterLoader.java      |   42 -
 147 files changed, 9164 insertions(+), 6465 deletions(-)

diff --git a/catalog/dummy-component/src/generated/resources/META-INF/services/org/apache/camel/other.properties b/catalog/dummy-component/src/generated/resources/META-INF/services/org/apache/camel/other.properties
deleted file mode 100644
index 2c30758..0000000
--- a/catalog/dummy-component/src/generated/resources/META-INF/services/org/apache/camel/other.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-name=dummy-component
-groupId=org.apache.camel
-artifactId=dummy-component
-version=3.1.0-SNAPSHOT
-projectName=Camel :: Catalog :: Dummy Component
-projectDescription=Camel Dummy Component
diff --git a/catalog/dummy-component/src/generated/resources/dummy-component.json b/catalog/dummy-component/src/generated/resources/dummy-component.json
deleted file mode 100644
index 10671390..0000000
--- a/catalog/dummy-component/src/generated/resources/dummy-component.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "other": {
-    "kind": "other",
-    "name": "dummy-component",
-    "title": "Dummy Component",
-    "description": "Camel Dummy Component",
-    "deprecated": false,
-    "groupId": "org.apache.camel",
-    "artifactId": "dummy-component",
-    "version": "3.1.0-SNAPSHOT"
-  }
-}
diff --git a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponentConfigurer.java b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java
similarity index 96%
rename from components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponentConfigurer.java
rename to components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java
index 8b1da1c..4edf5a6 100644
--- a/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponentConfigurer.java
+++ b/components/camel-xmlsecurity/src/generated/java/org/apache/camel/component/xmlsecurity/XmlSignerComponentConfigurer.java
@@ -9,9 +9,9 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
  * Generated by camel build tools - do NOT edit this file!
  */
 @SuppressWarnings("unchecked")
-public class XmlSignatureComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
+public class XmlSignerComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
 
-    private org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration getOrCreateConfiguration(XmlSignatureComponent target) {
+    private org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration getOrCreateConfiguration(XmlSignerComponent target) {
         if (target.getSignerConfiguration() == null) {
             target.setSignerConfiguration(new org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration());
         }
@@ -20,7 +20,7 @@ public class XmlSignatureComponentConfigurer extends PropertyConfigurerSupport i
 
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        XmlSignatureComponent target = (XmlSignatureComponent) obj;
+        XmlSignerComponent target = (XmlSignerComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "addkeyinforeference":
         case "addKeyInfoReference": getOrCreateConfiguration(target).setAddKeyInfoReference(property(camelContext, java.lang.Boolean.class, value)); return true;
diff --git a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/component/xmlsecurity-sign b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/component/xmlsecurity-sign
index 84bf921..3d41fde 100644
--- a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/component/xmlsecurity-sign
+++ b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/component/xmlsecurity-sign
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.xmlsecurity.XmlSignatureComponent
+class=org.apache.camel.component.xmlsecurity.XmlSignerComponent
diff --git a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlsecurity-sign-component b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlsecurity-sign-component
index ee20a42..6bf5bed 100644
--- a/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlsecurity-sign-component
+++ b/components/camel-xmlsecurity/src/generated/resources/META-INF/services/org/apache/camel/configurer/xmlsecurity-sign-component
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.xmlsecurity.XmlSignatureComponentConfigurer
+class=org.apache.camel.component.xmlsecurity.XmlSignerComponentConfigurer
diff --git a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json
index 7830cff..49f475a 100644
--- a/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json
+++ b/components/camel-xmlsecurity/src/generated/resources/org/apache/camel/component/xmlsecurity/xmlsecurity-sign.json
@@ -12,7 +12,7 @@
     "consumerOnly": false,
     "producerOnly": true,
     "lenientProperties": false,
-    "javaType": "org.apache.camel.component.xmlsecurity.XmlSignatureComponent",
+    "javaType": "org.apache.camel.component.xmlsecurity.XmlSignerComponent",
     "firstVersion": "2.12.0",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xmlsecurity",
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerComponent.java
similarity index 91%
rename from components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java
rename to components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerComponent.java
index 83e7006..1a64109 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignatureComponent.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerComponent.java
@@ -1,66 +1,66 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.component.xmlsecurity;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Endpoint;
-import org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration;
-import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.annotations.Component;
-import org.apache.camel.support.DefaultComponent;
-
-@Component("xmlsecurity-sign")
-public class XmlSignatureComponent extends DefaultComponent {
-
-    @Metadata(label = "advanced")
-    private XmlSignerConfiguration signerConfiguration;
-
-    public XmlSignatureComponent() {
-    }
-
-    public XmlSignatureComponent(CamelContext context) {
-        super(context);
-    }
-
-    @Override
-    protected Endpoint createEndpoint(String uri, String remaining,
-                                      Map<String, Object> parameters) throws Exception {
-
-        XmlSignerConfiguration config = signerConfiguration != null ? signerConfiguration.copy() : new XmlSignerConfiguration();
-        XmlSignerEndpoint endpoint = new XmlSignerEndpoint(uri, this, config);
-        endpoint.setName(remaining);
-        setProperties(endpoint, parameters);
-        return endpoint;
-    }
-
-    public XmlSignerConfiguration getSignerConfiguration() {
-        if (signerConfiguration == null) {
-            signerConfiguration = new XmlSignerConfiguration();
-        }
-        return signerConfiguration;
-    }
-
-    /**
-     * To use a shared XmlSignerConfiguration configuration to use as base for configuring endpoints.
-     */
-    public void setSignerConfiguration(XmlSignerConfiguration signerConfiguration) {
-        this.signerConfiguration = signerConfiguration;
-    }
-
-}
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.component.xmlsecurity;
+
+import java.util.Map;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Endpoint;
+import org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration;
+import org.apache.camel.spi.Metadata;
+import org.apache.camel.spi.annotations.Component;
+import org.apache.camel.support.DefaultComponent;
+
+@Component("xmlsecurity-sign")
+public class XmlSignerComponent extends DefaultComponent {
+
+    @Metadata(label = "advanced")
+    private XmlSignerConfiguration signerConfiguration;
+
+    public XmlSignerComponent() {
+    }
+
+    public XmlSignerComponent(CamelContext context) {
+        super(context);
+    }
+
+    @Override
+    protected Endpoint createEndpoint(String uri, String remaining,
+                                      Map<String, Object> parameters) throws Exception {
+
+        XmlSignerConfiguration config = signerConfiguration != null ? signerConfiguration.copy() : new XmlSignerConfiguration();
+        XmlSignerEndpoint endpoint = new XmlSignerEndpoint(uri, this, config);
+        endpoint.setName(remaining);
+        setProperties(endpoint, parameters);
+        return endpoint;
+    }
+
+    public XmlSignerConfiguration getSignerConfiguration() {
+        if (signerConfiguration == null) {
+            signerConfiguration = new XmlSignerConfiguration();
+        }
+        return signerConfiguration;
+    }
+
+    /**
+     * To use a shared XmlSignerConfiguration configuration to use as base for configuring endpoints.
+     */
+    public void setSignerConfiguration(XmlSignerConfiguration signerConfiguration) {
+        this.signerConfiguration = signerConfiguration;
+    }
+
+}
diff --git a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpoint.java b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpoint.java
index a3a8c93..7634aa5 100644
--- a/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpoint.java
+++ b/components/camel-xmlsecurity/src/main/java/org/apache/camel/component/xmlsecurity/XmlSignerEndpoint.java
@@ -40,7 +40,7 @@ public class XmlSignerEndpoint extends DefaultEndpoint {
     @UriParam
     private XmlSignerConfiguration configuration;
 
-    public XmlSignerEndpoint(String uri, XmlSignatureComponent component, XmlSignerConfiguration configuration) {
+    public XmlSignerEndpoint(String uri, XmlSignerComponent component, XmlSignerConfiguration configuration) {
         super(uri, component);
         this.configuration = configuration;
     }
diff --git a/core/camel-allcomponents/pom.xml b/core/camel-allcomponents/pom.xml
index 327d574..3347fd4 100644
--- a/core/camel-allcomponents/pom.xml
+++ b/core/camel-allcomponents/pom.xml
@@ -236,6 +236,10 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.camel</groupId>
+			<artifactId>camel-base</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-bean-validator</artifactId>
 		</dependency>
 		<dependency>
diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
index 1bba5e4..52fc654 100644
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
+++ b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language.properties
@@ -1,7 +1,7 @@
 # Generated by camel build tools - do NOT edit this file!
-languages=ref exchangeProperty file simple constant tokenize header
+languages=constant exchangeProperty file header ref simple tokenize
 groupId=org.apache.camel
 artifactId=camel-base
-version=3.1.0-SNAPSHOT
+version=3.2.0-SNAPSHOT
 projectName=Camel :: Base
 projectDescription=The Base Camel Framework
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json b/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
index 6bc6773..f91599a 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/constant/constant.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.ConstantExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json b/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
index 65b6c8c..4c67e3e 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/header/header.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.HeaderExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json b/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
index 7833562..da11bca 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/property/exchangeProperty.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.ExchangePropertyExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json b/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
index 7227225..78e820c 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/ref/ref.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.RefExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json b/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
index ad14594..02918b4 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/simple/file.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.SimpleExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json b/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
index 9dc2b0a..93453d12 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/simple/simple.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.SimpleExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The expression value in your chosen language syntax" },
diff --git a/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json b/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
index bafecf2..ec3c7ff 100644
--- a/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
+++ b/core/camel-base/src/generated/resources/org/apache/camel/language/tokenizer/tokenize.json
@@ -13,7 +13,7 @@
     "modelJavaType": "org.apache.camel.model.language.TokenizerExpression",
     "groupId": "org.apache.camel",
     "artifactId": "camel-base",
-    "version": "3.1.0-SNAPSHOT"
+    "version": "3.2.0-SNAPSHOT"
   },
   "properties": {
     "token": { "kind": "attribute", "displayName": "Token", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The (start) token to use as tokenizer, for example you can use the new line token. You can use simple language as the token to support dynamic tokens." },
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
index 4766e2d..a3fb33a 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/XmlsecuritySignComponentBuilderFactory.java
@@ -20,7 +20,7 @@ import javax.annotation.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.xmlsecurity.XmlSignatureComponent;
+import org.apache.camel.component.xmlsecurity.XmlSignerComponent;
 
 /**
  * Used to sign exchanges using the XML signature specification.
@@ -47,7 +47,7 @@ public interface XmlsecuritySignComponentBuilderFactory {
      */
     interface XmlsecuritySignComponentBuilder
             extends
-                ComponentBuilder<XmlSignatureComponent> {
+                ComponentBuilder<XmlSignerComponent> {
         /**
          * In order to protect the KeyInfo element from tampering you can add a
          * reference to the signed info element so that it is protected via the
@@ -524,15 +524,15 @@ public interface XmlsecuritySignComponentBuilderFactory {
 
     class XmlsecuritySignComponentBuilderImpl
             extends
-                AbstractComponentBuilder<XmlSignatureComponent>
+                AbstractComponentBuilder<XmlSignerComponent>
             implements
                 XmlsecuritySignComponentBuilder {
         @Override
-        protected XmlSignatureComponent buildConcreteComponent() {
-            return new XmlSignatureComponent();
+        protected XmlSignerComponent buildConcreteComponent() {
+            return new XmlSignerComponent();
         }
         private org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration getOrCreateConfiguration(
-                org.apache.camel.component.xmlsecurity.XmlSignatureComponent component) {
+                org.apache.camel.component.xmlsecurity.XmlSignerComponent component) {
             if (component.getSignerConfiguration() == null) {
                 component.setSignerConfiguration(new org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration());
             }
@@ -544,35 +544,35 @@ public interface XmlsecuritySignComponentBuilderFactory {
                 String name,
                 Object value) {
             switch (name) {
-            case "addKeyInfoReference": getOrCreateConfiguration((XmlSignatureComponent) component).setAddKeyInfoReference((java.lang.Boolean) value); return true;
-            case "baseUri": getOrCreateConfiguration((XmlSignatureComponent) component).setBaseUri((java.lang.String) value); return true;
-            case "canonicalizationMethod": getOrCreateConfiguration((XmlSignatureComponent) component).setCanonicalizationMethod((javax.xml.crypto.AlgorithmMethod) value); return true;
-            case "clearHeaders": getOrCreateConfiguration((XmlSignatureComponent) component).setClearHeaders((java.lang.Boolean) value); return true;
-            case "contentObjectId": getOrCreateConfiguration((XmlSignatureComponent) component).setContentObjectId((java.lang.String) value); return true;
-            case "contentReferenceType": getOrCreateConfiguration((XmlSignatureComponent) component).setContentReferenceType((java.lang.String) value); return true;
-            case "contentReferenceUri": getOrCreateConfiguration((XmlSignatureComponent) component).setContentReferenceUri((java.lang.String) value); return true;
-            case "cryptoContextProperties": getOrCreateConfiguration((XmlSignatureComponent) component).setCryptoContextProperties((java.util.Map) value); return true;
-            case "digestAlgorithm": getOrCreateConfiguration((XmlSignatureComponent) component).setDigestAlgorithm((java.lang.String) value); return true;
-            case "disallowDoctypeDecl": getOrCreateConfiguration((XmlSignatureComponent) component).setDisallowDoctypeDecl((java.lang.Boolean) value); return true;
-            case "keyAccessor": getOrCreateConfiguration((XmlSignatureComponent) component).setKeyAccessor((org.apache.camel.component.xmlsecurity.api.KeyAccessor) value); return true;
-            case "omitXmlDeclaration": getOrCreateConfiguration((XmlSignatureComponent) component).setOmitXmlDeclaration((java.lang.Boolean) value); return true;
-            case "outputXmlEncoding": getOrCreateConfiguration((XmlSignatureComponent) component).setOutputXmlEncoding((java.lang.String) value); return true;
-            case "lazyStartProducer": ((XmlSignatureComponent) component).setLazyStartProducer((boolean) value); return true;
-            case "parentLocalName": getOrCreateConfiguration((XmlSignatureComponent) component).setParentLocalName((java.lang.String) value); return true;
-            case "parentNamespace": getOrCreateConfiguration((XmlSignatureComponent) component).setParentNamespace((java.lang.String) value); return true;
-            case "parentXpath": getOrCreateConfiguration((XmlSignatureComponent) component).setParentXpath((javax.xml.crypto.dsig.spec.XPathFilterParameterSpec) value); return true;
-            case "plainText": getOrCreateConfiguration((XmlSignatureComponent) component).setPlainText((java.lang.Boolean) value); return true;
-            case "plainTextEncoding": getOrCreateConfiguration((XmlSignatureComponent) component).setPlainTextEncoding((java.lang.String) value); return true;
-            case "prefixForXmlSignatureNamespace": getOrCreateConfiguration((XmlSignatureComponent) component).setPrefixForXmlSignatureNamespace((java.lang.String) value); return true;
-            case "properties": getOrCreateConfiguration((XmlSignatureComponent) component).setProperties((org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties) value); return true;
-            case "schemaResourceUri": getOrCreateConfiguration((XmlSignatureComponent) component).setSchemaResourceUri((java.lang.String) value); return true;
-            case "signatureAlgorithm": getOrCreateConfiguration((XmlSignatureComponent) component).setSignatureAlgorithm((java.lang.String) value); return true;
-            case "signatureId": getOrCreateConfiguration((XmlSignatureComponent) component).setSignatureId((java.lang.String) value); return true;
-            case "transformMethods": getOrCreateConfiguration((XmlSignatureComponent) component).setTransformMethods((java.util.List) value); return true;
-            case "xpathsToIdAttributes": getOrCreateConfiguration((XmlSignatureComponent) component).setXpathsToIdAttributes((java.util.List) value); return true;
-            case "basicPropertyBinding": ((XmlSignatureComponent) component).setBasicPropertyBinding((boolean) value); return true;
-            case "signerConfiguration": ((XmlSignatureComponent) component).setSignerConfiguration((org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration) value); return true;
-            case "uriDereferencer": getOrCreateConfiguration((XmlSignatureComponent) component).setUriDereferencer((javax.xml.crypto.URIDereferencer) value); return true;
+            case "addKeyInfoReference": getOrCreateConfiguration((XmlSignerComponent) component).setAddKeyInfoReference((java.lang.Boolean) value); return true;
+            case "baseUri": getOrCreateConfiguration((XmlSignerComponent) component).setBaseUri((java.lang.String) value); return true;
+            case "canonicalizationMethod": getOrCreateConfiguration((XmlSignerComponent) component).setCanonicalizationMethod((javax.xml.crypto.AlgorithmMethod) value); return true;
+            case "clearHeaders": getOrCreateConfiguration((XmlSignerComponent) component).setClearHeaders((java.lang.Boolean) value); return true;
+            case "contentObjectId": getOrCreateConfiguration((XmlSignerComponent) component).setContentObjectId((java.lang.String) value); return true;
+            case "contentReferenceType": getOrCreateConfiguration((XmlSignerComponent) component).setContentReferenceType((java.lang.String) value); return true;
+            case "contentReferenceUri": getOrCreateConfiguration((XmlSignerComponent) component).setContentReferenceUri((java.lang.String) value); return true;
+            case "cryptoContextProperties": getOrCreateConfiguration((XmlSignerComponent) component).setCryptoContextProperties((java.util.Map) value); return true;
+            case "digestAlgorithm": getOrCreateConfiguration((XmlSignerComponent) component).setDigestAlgorithm((java.lang.String) value); return true;
+            case "disallowDoctypeDecl": getOrCreateConfiguration((XmlSignerComponent) component).setDisallowDoctypeDecl((java.lang.Boolean) value); return true;
+            case "keyAccessor": getOrCreateConfiguration((XmlSignerComponent) component).setKeyAccessor((org.apache.camel.component.xmlsecurity.api.KeyAccessor) value); return true;
+            case "omitXmlDeclaration": getOrCreateConfiguration((XmlSignerComponent) component).setOmitXmlDeclaration((java.lang.Boolean) value); return true;
+            case "outputXmlEncoding": getOrCreateConfiguration((XmlSignerComponent) component).setOutputXmlEncoding((java.lang.String) value); return true;
+            case "lazyStartProducer": ((XmlSignerComponent) component).setLazyStartProducer((boolean) value); return true;
+            case "parentLocalName": getOrCreateConfiguration((XmlSignerComponent) component).setParentLocalName((java.lang.String) value); return true;
+            case "parentNamespace": getOrCreateConfiguration((XmlSignerComponent) component).setParentNamespace((java.lang.String) value); return true;
+            case "parentXpath": getOrCreateConfiguration((XmlSignerComponent) component).setParentXpath((javax.xml.crypto.dsig.spec.XPathFilterParameterSpec) value); return true;
+            case "plainText": getOrCreateConfiguration((XmlSignerComponent) component).setPlainText((java.lang.Boolean) value); return true;
+            case "plainTextEncoding": getOrCreateConfiguration((XmlSignerComponent) component).setPlainTextEncoding((java.lang.String) value); return true;
+            case "prefixForXmlSignatureNamespace": getOrCreateConfiguration((XmlSignerComponent) component).setPrefixForXmlSignatureNamespace((java.lang.String) value); return true;
+            case "properties": getOrCreateConfiguration((XmlSignerComponent) component).setProperties((org.apache.camel.component.xmlsecurity.api.XmlSignatureProperties) value); return true;
+            case "schemaResourceUri": getOrCreateConfiguration((XmlSignerComponent) component).setSchemaResourceUri((java.lang.String) value); return true;
+            case "signatureAlgorithm": getOrCreateConfiguration((XmlSignerComponent) component).setSignatureAlgorithm((java.lang.String) value); return true;
+            case "signatureId": getOrCreateConfiguration((XmlSignerComponent) component).setSignatureId((java.lang.String) value); return true;
+            case "transformMethods": getOrCreateConfiguration((XmlSignerComponent) component).setTransformMethods((java.util.List) value); return true;
+            case "xpathsToIdAttributes": getOrCreateConfiguration((XmlSignerComponent) component).setXpathsToIdAttributes((java.util.List) value); return true;
+            case "basicPropertyBinding": ((XmlSignerComponent) component).setBasicPropertyBinding((boolean) value); return true;
+            case "signerConfiguration": ((XmlSignerComponent) component).setSignerConfiguration((org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration) value); return true;
+            case "uriDereferencer": getOrCreateConfiguration((XmlSignerComponent) component).setUriDereferencer((javax.xml.crypto.URIDereferencer) value); return true;
             default: return false;
             }
         }
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index 7e246b1..cbca26f 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -6789,7 +6789,7 @@
     "consumerOnly": false,
     "producerOnly": true,
     "lenientProperties": false,
-    "javaType": "org.apache.camel.component.xmlsecurity.XmlSignatureComponent",
+    "javaType": "org.apache.camel.component.xmlsecurity.XmlSignerComponent",
     "firstVersion": "2.12.0",
     "groupId": "org.apache.camel",
     "artifactId": "camel-xmlsecurity",
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index c07c85f..79523d6 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -30,6 +30,7 @@ public interface EndpointBuilderFactory
         extends
             org.apache.camel.builder.endpoint.dsl.AMQPEndpointBuilderFactory.AMQPBuilders,
             org.apache.camel.builder.endpoint.dsl.AS2EndpointBuilderFactory.AS2Builders,
+            org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory.AWS2EC2Builders,
             org.apache.camel.builder.endpoint.dsl.ActiveMQEndpointBuilderFactory.ActiveMQBuilders,
             org.apache.camel.builder.endpoint.dsl.AhcEndpointBuilderFactory.AhcBuilders,
             org.apache.camel.builder.endpoint.dsl.ApnsEndpointBuilderFactory.ApnsBuilders,
@@ -71,12 +72,15 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.CouchbaseEndpointBuilderFactory.CouchbaseBuilders,
             org.apache.camel.builder.endpoint.dsl.CronEndpointBuilderFactory.CronBuilders,
             org.apache.camel.builder.endpoint.dsl.CryptoCmsEndpointBuilderFactory.CryptoCmsBuilders,
+            org.apache.camel.builder.endpoint.dsl.Cw2EndpointBuilderFactory.Cw2Builders,
             org.apache.camel.builder.endpoint.dsl.CwEndpointBuilderFactory.CwBuilders,
             org.apache.camel.builder.endpoint.dsl.CxfEndpointBuilderFactory.CxfBuilders,
             org.apache.camel.builder.endpoint.dsl.CxfRsEndpointBuilderFactory.CxfRsBuilders,
             org.apache.camel.builder.endpoint.dsl.DataFormatEndpointBuilderFactory.DataFormatBuilders,
             org.apache.camel.builder.endpoint.dsl.DataSetEndpointBuilderFactory.DataSetBuilders,
             org.apache.camel.builder.endpoint.dsl.DataSetTestEndpointBuilderFactory.DataSetTestBuilders,
+            org.apache.camel.builder.endpoint.dsl.Ddb2EndpointBuilderFactory.Ddb2Builders,
+            org.apache.camel.builder.endpoint.dsl.Ddb2StreamEndpointBuilderFactory.Ddb2StreamBuilders,
             org.apache.camel.builder.endpoint.dsl.DdbEndpointBuilderFactory.DdbBuilders,
             org.apache.camel.builder.endpoint.dsl.DdbStreamEndpointBuilderFactory.DdbStreamBuilders,
             org.apache.camel.builder.endpoint.dsl.DebeziumMongodbEndpointBuilderFactory.DebeziumMongodbBuilders,
@@ -103,7 +107,9 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory.ElasticsearchBuilders,
             org.apache.camel.builder.endpoint.dsl.ElsqlEndpointBuilderFactory.ElsqlBuilders,
             org.apache.camel.builder.endpoint.dsl.ElytronEndpointBuilderFactory.ElytronBuilders,
-            org.apache.camel.builder.endpoint.dsl.EtcdEndpointBuilderFactory.EtcdBuilders,
+            org.apache.camel.builder.endpoint.dsl.EtcdKeysEndpointBuilderFactory.EtcdKeysBuilders,
+            org.apache.camel.builder.endpoint.dsl.EtcdStatsEndpointBuilderFactory.EtcdStatsBuilders,
+            org.apache.camel.builder.endpoint.dsl.EtcdWatchEndpointBuilderFactory.EtcdWatchBuilders,
             org.apache.camel.builder.endpoint.dsl.EventAdminEndpointBuilderFactory.EventAdminBuilders,
             org.apache.camel.builder.endpoint.dsl.EventEndpointBuilderFactory.EventBuilders,
             org.apache.camel.builder.endpoint.dsl.ExecEndpointBuilderFactory.ExecBuilders,
@@ -153,6 +159,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.HdfsEndpointBuilderFactory.HdfsBuilders,
             org.apache.camel.builder.endpoint.dsl.HipchatEndpointBuilderFactory.HipchatBuilders,
             org.apache.camel.builder.endpoint.dsl.HttpEndpointBuilderFactory.HttpBuilders,
+            org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory.IAM2Builders,
             org.apache.camel.builder.endpoint.dsl.IAMEndpointBuilderFactory.IAMBuilders,
             org.apache.camel.builder.endpoint.dsl.IOTAEndpointBuilderFactory.IOTABuilders,
             org.apache.camel.builder.endpoint.dsl.IPFSEndpointBuilderFactory.IPFSBuilders,
@@ -190,7 +197,9 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.KMSEndpointBuilderFactory.KMSBuilders,
             org.apache.camel.builder.endpoint.dsl.KafkaEndpointBuilderFactory.KafkaBuilders,
             org.apache.camel.builder.endpoint.dsl.KeystoneEndpointBuilderFactory.KeystoneBuilders,
+            org.apache.camel.builder.endpoint.dsl.Kinesis2EndpointBuilderFactory.Kinesis2Builders,
             org.apache.camel.builder.endpoint.dsl.KinesisEndpointBuilderFactory.KinesisBuilders,
+            org.apache.camel.builder.endpoint.dsl.KinesisFirehose2EndpointBuilderFactory.KinesisFirehose2Builders,
             org.apache.camel.builder.endpoint.dsl.KinesisFirehoseEndpointBuilderFactory.KinesisFirehoseBuilders,
             org.apache.camel.builder.endpoint.dsl.KubernetesConfigMapsEndpointBuilderFactory.KubernetesConfigMapsBuilders,
             org.apache.camel.builder.endpoint.dsl.KubernetesDeploymentsEndpointBuilderFactory.KubernetesDeploymentsBuilders,
@@ -207,6 +216,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.KubernetesServiceAccountsEndpointBuilderFactory.KubernetesServiceAccountsBuilders,
             org.apache.camel.builder.endpoint.dsl.KubernetesServicesEndpointBuilderFactory.KubernetesServicesBuilders,
             org.apache.camel.builder.endpoint.dsl.KuduEndpointBuilderFactory.KuduBuilders,
+            org.apache.camel.builder.endpoint.dsl.Lambda2EndpointBuilderFactory.Lambda2Builders,
             org.apache.camel.builder.endpoint.dsl.LambdaEndpointBuilderFactory.LambdaBuilders,
             org.apache.camel.builder.endpoint.dsl.LanguageEndpointBuilderFactory.LanguageBuilders,
             org.apache.camel.builder.endpoint.dsl.LdapEndpointBuilderFactory.LdapBuilders,
@@ -283,6 +293,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.ServiceEndpointBuilderFactory.ServiceBuilders,
             org.apache.camel.builder.endpoint.dsl.ServiceNowEndpointBuilderFactory.ServiceNowBuilders,
             org.apache.camel.builder.endpoint.dsl.ServletEndpointBuilderFactory.ServletBuilders,
+            org.apache.camel.builder.endpoint.dsl.Ses2EndpointBuilderFactory.Ses2Builders,
             org.apache.camel.builder.endpoint.dsl.SesEndpointBuilderFactory.SesBuilders,
             org.apache.camel.builder.endpoint.dsl.SftpEndpointBuilderFactory.SftpBuilders,
             org.apache.camel.builder.endpoint.dsl.SipEndpointBuilderFactory.SipBuilders,
@@ -292,6 +303,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.SlackEndpointBuilderFactory.SlackBuilders,
             org.apache.camel.builder.endpoint.dsl.SmppEndpointBuilderFactory.SmppBuilders,
             org.apache.camel.builder.endpoint.dsl.SnmpEndpointBuilderFactory.SnmpBuilders,
+            org.apache.camel.builder.endpoint.dsl.Sns2EndpointBuilderFactory.Sns2Builders,
             org.apache.camel.builder.endpoint.dsl.SnsEndpointBuilderFactory.SnsBuilders,
             org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory.SolrBuilders,
             org.apache.camel.builder.endpoint.dsl.SoroushBotEndpointBuilderFactory.SoroushBotBuilders,
@@ -303,6 +315,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.SpringWebserviceEndpointBuilderFactory.SpringWebserviceBuilders,
             org.apache.camel.builder.endpoint.dsl.SqlEndpointBuilderFactory.SqlBuilders,
             org.apache.camel.builder.endpoint.dsl.SqlStoredEndpointBuilderFactory.SqlStoredBuilders,
+            org.apache.camel.builder.endpoint.dsl.Sqs2EndpointBuilderFactory.Sqs2Builders,
             org.apache.camel.builder.endpoint.dsl.SqsEndpointBuilderFactory.SqsBuilders,
             org.apache.camel.builder.endpoint.dsl.SshEndpointBuilderFactory.SshBuilders,
             org.apache.camel.builder.endpoint.dsl.StAXEndpointBuilderFactory.StAXBuilders,
@@ -337,7 +350,8 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.XChangeEndpointBuilderFactory.XChangeBuilders,
             org.apache.camel.builder.endpoint.dsl.XJEndpointBuilderFactory.XJBuilders,
             org.apache.camel.builder.endpoint.dsl.XQueryEndpointBuilderFactory.XQueryBuilders,
-            org.apache.camel.builder.endpoint.dsl.XmlSignatureEndpointBuilderFactory.XmlSignatureBuilders,
+            org.apache.camel.builder.endpoint.dsl.XmlSignerEndpointBuilderFactory.XmlSignerBuilders,
+            org.apache.camel.builder.endpoint.dsl.XmlVerifierEndpointBuilderFactory.XmlVerifierBuilders,
             org.apache.camel.builder.endpoint.dsl.XmppEndpointBuilderFactory.XmppBuilders,
             org.apache.camel.builder.endpoint.dsl.XsltEndpointBuilderFactory.XsltBuilders,
             org.apache.camel.builder.endpoint.dsl.XsltSaxonEndpointBuilderFactory.XsltSaxonBuilders,
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index c2da52a..f5b519f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -27,6 +27,7 @@ public interface EndpointBuilders
         extends
             org.apache.camel.builder.endpoint.dsl.AMQPEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.AS2EndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.AWS2EC2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ActiveMQEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.AhcEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ApnsEndpointBuilderFactory,
@@ -68,12 +69,15 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.CouchbaseEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CronEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CryptoCmsEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Cw2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CwEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CxfEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.CxfRsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DataFormatEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DataSetEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DataSetTestEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Ddb2EndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Ddb2StreamEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DdbEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DdbStreamEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.DebeziumMongodbEndpointBuilderFactory,
@@ -100,7 +104,9 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.ElasticsearchEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ElsqlEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ElytronEndpointBuilderFactory,
-            org.apache.camel.builder.endpoint.dsl.EtcdEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.EtcdKeysEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.EtcdStatsEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.EtcdWatchEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.EventAdminEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.EventEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ExecEndpointBuilderFactory,
@@ -150,6 +156,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.HdfsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.HipchatEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.HttpEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.IAM2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.IAMEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.IOTAEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.IPFSEndpointBuilderFactory,
@@ -187,7 +194,9 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.KMSEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KafkaEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KeystoneEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Kinesis2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KinesisEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.KinesisFirehose2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KinesisFirehoseEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KubernetesConfigMapsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KubernetesDeploymentsEndpointBuilderFactory,
@@ -204,6 +213,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.KubernetesServiceAccountsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KubernetesServicesEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.KuduEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Lambda2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.LambdaEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.LanguageEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.LdapEndpointBuilderFactory,
@@ -280,6 +290,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.ServiceEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ServiceNowEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.ServletEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Ses2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SesEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SftpEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SipEndpointBuilderFactory,
@@ -289,6 +300,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.SlackEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SmppEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SnmpEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Sns2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SnsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SoroushBotEndpointBuilderFactory,
@@ -300,6 +312,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.SpringWebserviceEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SqlEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SqlStoredEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.Sqs2EndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SqsEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SshEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.StAXEndpointBuilderFactory,
@@ -334,7 +347,8 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.XChangeEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XJEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XQueryEndpointBuilderFactory,
-            org.apache.camel.builder.endpoint.dsl.XmlSignatureEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.XmlSignerEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.XmlVerifierEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XmppEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XsltEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.XsltSaxonEndpointBuilderFactory,
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
index 33762bb..b041177 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AMQPEndpointBuilderFactory.java
@@ -26,9 +26,7 @@ import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
- * Messaging with AMQP protocol using Apache QPid Client. This class extends
- * JmsEndpoint because it uses Apache Qpid JMS-compatible client for performing
- * the AMQP connectivity.
+ * Messaging with AMQP protocol using Apache QPid Client.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -287,44 +285,6 @@ public interface AMQPEndpointBuilderFactory {
             return this;
         }
         /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions occurred while the consumer is trying to
-         * pickup incoming messages, or the likes, will now be processed as a
-         * message and handled by the routing Error Handler. By default the
-         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
-         * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: consumer
-         */
-        default AMQPEndpointConsumerBuilder bridgeErrorHandler(
-                boolean bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions occurred while the consumer is trying to
-         * pickup incoming messages, or the likes, will now be processed as a
-         * message and handled by the routing Error Handler. By default the
-         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
-         * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: consumer
-         */
-        default AMQPEndpointConsumerBuilder bridgeErrorHandler(
-                String bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
          * Sets the cache level by ID for the underlying JMS resources. See
          * cacheLevelName option for more details.
          * 
@@ -5431,9 +5391,7 @@ public interface AMQPEndpointBuilderFactory {
     public interface AMQPBuilders {
         /**
          * AMQP (camel-amqp)
-         * Messaging with AMQP protocol using Apache QPid Client. This class
-         * extends JmsEndpoint because it uses Apache Qpid JMS-compatible client
-         * for performing the AMQP connectivity.
+         * Messaging with AMQP protocol using Apache QPid Client.
          * 
          * Category: messaging
          * Since: 1.2
@@ -5455,9 +5413,7 @@ public interface AMQPEndpointBuilderFactory {
     }
     /**
      * AMQP (camel-amqp)
-     * Messaging with AMQP protocol using Apache QPid Client. This class extends
-     * JmsEndpoint because it uses Apache Qpid JMS-compatible client for
-     * performing the AMQP connectivity.
+     * Messaging with AMQP protocol using Apache QPid Client.
      * 
      * Category: messaging
      * Since: 1.2
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
similarity index 72%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
index 4ffd4f3..52c59b3 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
@@ -22,20 +22,20 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws-ec2 is used for managing Amazon EC2 instances.
+ * The aws2-ec2 is used for managing Amazon EC2 instances.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface EC2EndpointBuilderFactory {
+public interface AWS2EC2EndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the AWS EC2 component.
+     * Builder for endpoint for the AWS 2 EC2 component.
      */
-    public interface EC2EndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedEC2EndpointBuilder advanced() {
-            return (AdvancedEC2EndpointBuilder) this;
+    public interface AWS2EC2EndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedAWS2EC2EndpointBuilder advanced() {
+            return (AdvancedAWS2EC2EndpointBuilder) this;
         }
         /**
          * Amazon AWS Access Key.
@@ -44,19 +44,19 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder accessKey(String accessKey) {
+        default AWS2EC2EndpointBuilder accessKey(String accessKey) {
             doSetProperty("accessKey", accessKey);
             return this;
         }
         /**
          * To use a existing configured AmazonEC2Client as client.
          * 
-         * The option is a: <code>com.amazonaws.services.ec2.AmazonEC2</code>
-         * type.
+         * The option is a:
+         * <code>software.amazon.awssdk.services.ec2.Ec2Client</code> type.
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder amazonEc2Client(Object amazonEc2Client) {
+        default AWS2EC2EndpointBuilder amazonEc2Client(Object amazonEc2Client) {
             doSetProperty("amazonEc2Client", amazonEc2Client);
             return this;
         }
@@ -64,11 +64,11 @@ public interface EC2EndpointBuilderFactory {
          * To use a existing configured AmazonEC2Client as client.
          * 
          * The option will be converted to a
-         * <code>com.amazonaws.services.ec2.AmazonEC2</code> type.
+         * <code>software.amazon.awssdk.services.ec2.Ec2Client</code> type.
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder amazonEc2Client(String amazonEc2Client) {
+        default AWS2EC2EndpointBuilder amazonEc2Client(String amazonEc2Client) {
             doSetProperty("amazonEc2Client", amazonEc2Client);
             return this;
         }
@@ -88,7 +88,8 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EC2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
+        default AWS2EC2EndpointBuilder lazyStartProducer(
+                boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -108,7 +109,8 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EC2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
+        default AWS2EC2EndpointBuilder lazyStartProducer(
+                String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -119,12 +121,13 @@ public interface EC2EndpointBuilderFactory {
          * unmonitorInstances, createTags or deleteTags.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.aws.ec2.EC2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.ec2.AWS2EC2Operations</code>
+         * type.
          * 
          * Required: true
          * Group: producer
          */
-        default EC2EndpointBuilder operation(EC2Operations operation) {
+        default AWS2EC2EndpointBuilder operation(AWS2EC2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -135,12 +138,13 @@ public interface EC2EndpointBuilderFactory {
          * unmonitorInstances, createTags or deleteTags.
          * 
          * The option will be converted to a
-         * <code>org.apache.camel.component.aws.ec2.EC2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.ec2.AWS2EC2Operations</code>
+         * type.
          * 
          * Required: true
          * Group: producer
          */
-        default EC2EndpointBuilder operation(String operation) {
+        default AWS2EC2EndpointBuilder operation(String operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -151,7 +155,7 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder proxyHost(String proxyHost) {
+        default AWS2EC2EndpointBuilder proxyHost(String proxyHost) {
             doSetProperty("proxyHost", proxyHost);
             return this;
         }
@@ -162,7 +166,7 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder proxyPort(Integer proxyPort) {
+        default AWS2EC2EndpointBuilder proxyPort(Integer proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
@@ -174,32 +178,33 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder proxyPort(String proxyPort) {
+        default AWS2EC2EndpointBuilder proxyPort(String proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
          * To define a proxy protocol when instantiating the EC2 client.
          * 
-         * The option is a: <code>com.amazonaws.Protocol</code> type.
+         * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
+         * type.
          * 
          * Default: HTTPS
          * Group: producer
          */
-        default EC2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default AWS2EC2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
          * To define a proxy protocol when instantiating the EC2 client.
          * 
-         * The option will be converted to a <code>com.amazonaws.Protocol</code>
-         * type.
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.core.Protocol</code> type.
          * 
          * Default: HTTPS
          * Group: producer
          */
-        default EC2EndpointBuilder proxyProtocol(String proxyProtocol) {
+        default AWS2EC2EndpointBuilder proxyProtocol(String proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -213,7 +218,7 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder region(String region) {
+        default AWS2EC2EndpointBuilder region(String region) {
             doSetProperty("region", region);
             return this;
         }
@@ -224,20 +229,20 @@ public interface EC2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EC2EndpointBuilder secretKey(String secretKey) {
+        default AWS2EC2EndpointBuilder secretKey(String secretKey) {
             doSetProperty("secretKey", secretKey);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the AWS EC2 component.
+     * Advanced builder for endpoint for the AWS 2 EC2 component.
      */
-    public interface AdvancedEC2EndpointBuilder
+    public interface AdvancedAWS2EC2EndpointBuilder
             extends
                 EndpointProducerBuilder {
-        default EC2EndpointBuilder basic() {
-            return (EC2EndpointBuilder) this;
+        default AWS2EC2EndpointBuilder basic() {
+            return (AWS2EC2EndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -248,7 +253,7 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEC2EndpointBuilder basicPropertyBinding(
+        default AdvancedAWS2EC2EndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -262,7 +267,7 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEC2EndpointBuilder basicPropertyBinding(
+        default AdvancedAWS2EC2EndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -276,7 +281,7 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEC2EndpointBuilder synchronous(boolean synchronous) {
+        default AdvancedAWS2EC2EndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -289,7 +294,7 @@ public interface EC2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEC2EndpointBuilder synchronous(String synchronous) {
+        default AdvancedAWS2EC2EndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -297,9 +302,9 @@ public interface EC2EndpointBuilderFactory {
 
     /**
      * Proxy enum for
-     * <code>org.apache.camel.component.aws.ec2.EC2Operations</code> enum.
+     * <code>org.apache.camel.component.aws2.ec2.AWS2EC2Operations</code> enum.
      */
-    enum EC2Operations {
+    enum AWS2EC2Operations {
         createAndRunInstances,
         startInstances,
         stopInstances,
@@ -314,50 +319,50 @@ public interface EC2EndpointBuilderFactory {
     }
 
     /**
-     * Proxy enum for <code>com.amazonaws.Protocol</code> enum.
+     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
         http,
         https;
     }
 
-    public interface EC2Builders {
+    public interface AWS2EC2Builders {
         /**
-         * AWS EC2 (camel-aws-ec2)
-         * The aws-ec2 is used for managing Amazon EC2 instances.
+         * AWS 2 EC2 (camel-aws2-ec2)
+         * The aws2-ec2 is used for managing Amazon EC2 instances.
          * 
          * Category: cloud,management
-         * Since: 2.16
-         * Maven coordinates: org.apache.camel:camel-aws-ec2
+         * Since: 3.1
+         * Maven coordinates: org.apache.camel:camel-aws2-ec2
          * 
-         * Syntax: <code>aws-ec2:label</code>
+         * Syntax: <code>aws2-ec2:label</code>
          * 
          * Path parameter: label (required)
          * Logical name
          */
-        default EC2EndpointBuilder awsEc2(String path) {
-            return EC2EndpointBuilderFactory.awsEc2(path);
+        default AWS2EC2EndpointBuilder aws2Ec2(String path) {
+            return AWS2EC2EndpointBuilderFactory.aws2Ec2(path);
         }
     }
     /**
-     * AWS EC2 (camel-aws-ec2)
-     * The aws-ec2 is used for managing Amazon EC2 instances.
+     * AWS 2 EC2 (camel-aws2-ec2)
+     * The aws2-ec2 is used for managing Amazon EC2 instances.
      * 
      * Category: cloud,management
-     * Since: 2.16
-     * Maven coordinates: org.apache.camel:camel-aws-ec2
+     * Since: 3.1
+     * Maven coordinates: org.apache.camel:camel-aws2-ec2
      * 
-     * Syntax: <code>aws-ec2:label</code>
+     * Syntax: <code>aws2-ec2:label</code>
      * 
      * Path parameter: label (required)
      * Logical name
      */
-    static EC2EndpointBuilder awsEc2(String path) {
-        class EC2EndpointBuilderImpl extends AbstractEndpointBuilder implements EC2EndpointBuilder, AdvancedEC2EndpointBuilder {
-            public EC2EndpointBuilderImpl(String path) {
-                super("aws-ec2", path);
+    static AWS2EC2EndpointBuilder aws2Ec2(String path) {
+        class AWS2EC2EndpointBuilderImpl extends AbstractEndpointBuilder implements AWS2EC2EndpointBuilder, AdvancedAWS2EC2EndpointBuilder {
+            public AWS2EC2EndpointBuilderImpl(String path) {
+                super("aws2-ec2", path);
             }
         }
-        return new EC2EndpointBuilderImpl(path);
+        return new AWS2EC2EndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
index 90d081e..05cf2b1 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ActiveMQEndpointBuilderFactory.java
@@ -290,44 +290,6 @@ public interface ActiveMQEndpointBuilderFactory {
             return this;
         }
         /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions occurred while the consumer is trying to
-         * pickup incoming messages, or the likes, will now be processed as a
-         * message and handled by the routing Error Handler. By default the
-         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
-         * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: consumer
-         */
-        default ActiveMQEndpointConsumerBuilder bridgeErrorHandler(
-                boolean bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
-         * Allows for bridging the consumer to the Camel routing Error Handler,
-         * which mean any exceptions occurred while the consumer is trying to
-         * pickup incoming messages, or the likes, will now be processed as a
-         * message and handled by the routing Error Handler. By default the
-         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
-         * with exceptions, that will be logged at WARN or ERROR level and
-         * ignored.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: false
-         * Group: consumer
-         */
-        default ActiveMQEndpointConsumerBuilder bridgeErrorHandler(
-                String bridgeErrorHandler) {
-            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
-            return this;
-        }
-        /**
          * Sets the cache level by ID for the underlying JMS resources. See
          * cacheLevelName option for more details.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
index 43d259c..38a40e6 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AsteriskEndpointBuilderFactory.java
@@ -559,7 +559,7 @@ public interface AsteriskEndpointBuilderFactory {
          * Syntax: <code>asterisk:name</code>
          * 
          * Path parameter: name (required)
-         * Logical name
+         * Name of component
          */
         default AsteriskEndpointBuilder asterisk(String path) {
             return AsteriskEndpointBuilderFactory.asterisk(path);
@@ -576,7 +576,7 @@ public interface AsteriskEndpointBuilderFactory {
      * Syntax: <code>asterisk:name</code>
      * 
      * Path parameter: name (required)
-     * Logical name
+     * Name of component
      */
     static AsteriskEndpointBuilder asterisk(String path) {
         class AsteriskEndpointBuilderImpl extends AbstractEndpointBuilder implements AsteriskEndpointBuilder, AdvancedAsteriskEndpointBuilder {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
index 5237e81..d212b61 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AtmosphereWebsocketEndpointBuilderFactory.java
@@ -460,7 +460,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
         }
         /**
          * Whether to automatic bind multipart/form-data as attachments on the
-         * Camel Exchange . The options attachmentMultipartBinding=true and
+         * Camel Exchange. The options attachmentMultipartBinding=true and
          * disableStreamCache=false cannot work together. Remove
          * disableStreamCache to use AttachmentMultipartBinding. This is turn
          * off by default as this may require servlet specific configuration to
@@ -478,7 +478,7 @@ public interface AtmosphereWebsocketEndpointBuilderFactory {
         }
         /**
          * Whether to automatic bind multipart/form-data as attachments on the
-         * Camel Exchange . The options attachmentMultipartBinding=true and
+         * Camel Exchange. The options attachmentMultipartBinding=true and
          * disableStreamCache=false cannot work together. Remove
          * disableStreamCache to use AttachmentMultipartBinding. This is turn
          * off by default as this may require servlet specific configuration to
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
index 1ac69b3..47fb033 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BeanValidatorEndpointBuilderFactory.java
@@ -23,8 +23,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
  * The Validator component performs bean validation of the message body using
- * the Java Bean Validation API. Camel uses the reference implementation, which
- * is Hibernate Validator.
+ * the Java Bean Validation API.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -323,8 +322,7 @@ public interface BeanValidatorEndpointBuilderFactory {
         /**
          * Bean Validator (camel-bean-validator)
          * The Validator component performs bean validation of the message body
-         * using the Java Bean Validation API. Camel uses the reference
-         * implementation, which is Hibernate Validator.
+         * using the Java Bean Validation API.
          * 
          * Category: validation
          * Since: 2.3
@@ -342,8 +340,7 @@ public interface BeanValidatorEndpointBuilderFactory {
     /**
      * Bean Validator (camel-bean-validator)
      * The Validator component performs bean validation of the message body
-     * using the Java Bean Validation API. Camel uses the reference
-     * implementation, which is Hibernate Validator.
+     * using the Java Bean Validation API.
      * 
      * Category: validation
      * Since: 2.3
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
index 1dbbc8a..acb91e5 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BraintreeEndpointBuilderFactory.java
@@ -82,28 +82,6 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
-         * The private key provided by Braintree.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default BraintreeEndpointConsumerBuilder privateKey(String privateKey) {
-            doSetProperty("privateKey", privateKey);
-            return this;
-        }
-        /**
-         * The public key provided by Braintree.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default BraintreeEndpointConsumerBuilder publicKey(String publicKey) {
-            doSetProperty("publicKey", publicKey);
-            return this;
-        }
-        /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
          * which mean any exceptions occurred while the consumer is trying to
          * pickup incoming messages, or the likes, will now be processed as a
@@ -547,6 +525,74 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option is a: <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder httpLogLevel(Level httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option will be converted to a
+         * <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder httpLogLevel(
+                String httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set log category to use to log http calls.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Default: Braintree
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder httpLogName(String httpLogName) {
+            doSetProperty("httpLogName", httpLogName);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder logHandlerEnabled(
+                boolean logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointConsumerBuilder logHandlerEnabled(
+                String logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
          * The proxy host.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -580,6 +626,41 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
+        /**
+         * The access token granted by a merchant to another in order to process
+         * transactions on their behalf. Used in place of environment, merchant
+         * id, public key and private key fields.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointConsumerBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * The private key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointConsumerBuilder privateKey(String privateKey) {
+            doSetProperty("privateKey", privateKey);
+            return this;
+        }
+        /**
+         * The public key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointConsumerBuilder publicKey(String publicKey) {
+            doSetProperty("publicKey", publicKey);
+            return this;
+        }
     }
 
     /**
@@ -681,20 +762,6 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
-         * The access token granted by a merchant to another in order to process
-         * transactions on their behalf. Used in place of environment, merchant
-         * id, public key and private key fields.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -775,63 +842,6 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("synchronous", synchronous);
             return this;
         }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option is a: <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder httpLogLevel(
-                Level httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option will be converted to a
-         * <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder httpLogLevel(
-                String httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder logHandlerEnabled(
-                boolean logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointConsumerBuilder logHandlerEnabled(
-                String logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
     }
 
     /**
@@ -877,28 +887,6 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
-         * The private key provided by Braintree.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default BraintreeEndpointProducerBuilder privateKey(String privateKey) {
-            doSetProperty("privateKey", privateKey);
-            return this;
-        }
-        /**
-         * The public key provided by Braintree.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default BraintreeEndpointProducerBuilder publicKey(String publicKey) {
-            doSetProperty("publicKey", publicKey);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -941,6 +929,74 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option is a: <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder httpLogLevel(Level httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option will be converted to a
+         * <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder httpLogLevel(
+                String httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set log category to use to log http calls.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Default: Braintree
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder httpLogName(String httpLogName) {
+            doSetProperty("httpLogName", httpLogName);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder logHandlerEnabled(
+                boolean logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointProducerBuilder logHandlerEnabled(
+                String logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
          * The proxy host.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -974,17 +1030,6 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
-    }
-
-    /**
-     * Advanced builder for endpoint producers for the Braintree component.
-     */
-    public interface AdvancedBraintreeEndpointProducerBuilder
-            extends
-                EndpointProducerBuilder {
-        default BraintreeEndpointProducerBuilder basic() {
-            return (BraintreeEndpointProducerBuilder) this;
-        }
         /**
          * The access token granted by a merchant to another in order to process
          * transactions on their behalf. Used in place of environment, merchant
@@ -992,14 +1037,46 @@ public interface BraintreeEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: advanced
+         * Group: security
          */
-        default AdvancedBraintreeEndpointProducerBuilder accessToken(
-                String accessToken) {
+        default BraintreeEndpointProducerBuilder accessToken(String accessToken) {
             doSetProperty("accessToken", accessToken);
             return this;
         }
         /**
+         * The private key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointProducerBuilder privateKey(String privateKey) {
+            doSetProperty("privateKey", privateKey);
+            return this;
+        }
+        /**
+         * The public key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointProducerBuilder publicKey(String publicKey) {
+            doSetProperty("publicKey", publicKey);
+            return this;
+        }
+    }
+
+    /**
+     * Advanced builder for endpoint producers for the Braintree component.
+     */
+    public interface AdvancedBraintreeEndpointProducerBuilder
+            extends
+                EndpointProducerBuilder {
+        default BraintreeEndpointProducerBuilder basic() {
+            return (BraintreeEndpointProducerBuilder) this;
+        }
+        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -1080,63 +1157,6 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("synchronous", synchronous);
             return this;
         }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option is a: <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointProducerBuilder httpLogLevel(
-                Level httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option will be converted to a
-         * <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointProducerBuilder httpLogLevel(
-                String httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointProducerBuilder logHandlerEnabled(
-                boolean logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointProducerBuilder logHandlerEnabled(
-                String logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
     }
 
     /**
@@ -1183,25 +1203,70 @@ public interface BraintreeEndpointBuilderFactory {
             return this;
         }
         /**
-         * The private key provided by Braintree.
+         * Set logging level for http calls, see java.util.logging.Level.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.util.logging.Level</code> type.
          * 
-         * Group: common
+         * Group: logging
          */
-        default BraintreeEndpointBuilder privateKey(String privateKey) {
-            doSetProperty("privateKey", privateKey);
+        default BraintreeEndpointBuilder httpLogLevel(Level httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
             return this;
         }
         /**
-         * The public key provided by Braintree.
+         * Set logging level for http calls, see java.util.logging.Level.
+         * 
+         * The option will be converted to a
+         * <code>java.util.logging.Level</code> type.
+         * 
+         * Group: logging
+         */
+        default BraintreeEndpointBuilder httpLogLevel(String httpLogLevel) {
+            doSetProperty("httpLogLevel", httpLogLevel);
+            return this;
+        }
+        /**
+         * Set log category to use to log http calls.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Default: Braintree
+         * Group: logging
          */
-        default BraintreeEndpointBuilder publicKey(String publicKey) {
-            doSetProperty("publicKey", publicKey);
+        default BraintreeEndpointBuilder httpLogName(String httpLogName) {
+            doSetProperty("httpLogName", httpLogName);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointBuilder logHandlerEnabled(
+                boolean logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
+            return this;
+        }
+        /**
+         * Sets whether to enable the BraintreeLogHandler. It may be desirable
+         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
+         * on the classpath. This option can also be configured globally on the
+         * BraintreeComponent.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: logging
+         */
+        default BraintreeEndpointBuilder logHandlerEnabled(
+                String logHandlerEnabled) {
+            doSetProperty("logHandlerEnabled", logHandlerEnabled);
             return this;
         }
         /**
@@ -1238,6 +1303,41 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
+        /**
+         * The access token granted by a merchant to another in order to process
+         * transactions on their behalf. Used in place of environment, merchant
+         * id, public key and private key fields.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * The private key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointBuilder privateKey(String privateKey) {
+            doSetProperty("privateKey", privateKey);
+            return this;
+        }
+        /**
+         * The public key provided by Braintree.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default BraintreeEndpointBuilder publicKey(String publicKey) {
+            doSetProperty("publicKey", publicKey);
+            return this;
+        }
     }
 
     /**
@@ -1251,19 +1351,6 @@ public interface BraintreeEndpointBuilderFactory {
             return (BraintreeEndpointBuilder) this;
         }
         /**
-         * The access token granted by a merchant to another in order to process
-         * transactions on their behalf. Used in place of environment, merchant
-         * id, public key and private key fields.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: advanced
-         */
-        default AdvancedBraintreeEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -1342,62 +1429,6 @@ public interface BraintreeEndpointBuilderFactory {
             doSetProperty("synchronous", synchronous);
             return this;
         }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option is a: <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointBuilder httpLogLevel(Level httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Set logging level for http calls, see java.util.logging.Level.
-         * 
-         * The option will be converted to a
-         * <code>java.util.logging.Level</code> type.
-         * 
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointBuilder httpLogLevel(
-                String httpLogLevel) {
-            doSetProperty("httpLogLevel", httpLogLevel);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option is a: <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointBuilder logHandlerEnabled(
-                boolean logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
-        /**
-         * Sets whether to enable the BraintreeLogHandler. It may be desirable
-         * to set this to 'false' where an existing JUL - SLF4J logger bridge is
-         * on the classpath. This option can also be configured globally on the
-         * BraintreeComponent.
-         * 
-         * The option will be converted to a <code>boolean</code> type.
-         * 
-         * Default: true
-         * Group: logging
-         */
-        default AdvancedBraintreeEndpointBuilder logHandlerEnabled(
-                String logHandlerEnabled) {
-            doSetProperty("logHandlerEnabled", logHandlerEnabled);
-            return this;
-        }
     }
 
     public interface BraintreeBuilders {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
index 049241c..78412a1 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/BrowseEndpointBuilderFactory.java
@@ -25,9 +25,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The browse component is used for viewing the messages received on endpoints
- * that supports BrowsableEndpoint . This can be useful for testing,
- * visualisation tools or debugging. The exchanges sent to the endpoint are all
- * available to be browsed.
+ * that supports BrowsableEndpoint.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -410,9 +408,7 @@ public interface BrowseEndpointBuilderFactory {
         /**
          * Browse (camel-browse)
          * The browse component is used for viewing the messages received on
-         * endpoints that supports BrowsableEndpoint . This can be useful for
-         * testing, visualisation tools or debugging. The exchanges sent to the
-         * endpoint are all available to be browsed.
+         * endpoints that supports BrowsableEndpoint.
          * 
          * Category: core,monitoring
          * Since: 1.3
@@ -430,9 +426,7 @@ public interface BrowseEndpointBuilderFactory {
     /**
      * Browse (camel-browse)
      * The browse component is used for viewing the messages received on
-     * endpoints that supports BrowsableEndpoint . This can be useful for
-     * testing, visualisation tools or debugging. The exchanges sent to the
-     * endpoint are all available to be browsed.
+     * endpoints that supports BrowsableEndpoint.
      * 
      * Category: core,monitoring
      * Since: 1.3
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
index c582dd3..42dfd9a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ClientEndpointBuilderFactory.java
@@ -163,7 +163,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -177,7 +177,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -191,7 +191,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -204,7 +204,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -217,8 +217,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -231,8 +230,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -741,7 +739,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -755,7 +753,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -769,7 +767,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -782,7 +780,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -795,8 +793,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -809,8 +806,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -1215,7 +1211,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -1229,7 +1225,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The common ASDU address size. May be either SIZE_1 or SIZE_2 .
+         * The common ASDU address size. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.ASDUAddressType</code>
@@ -1242,7 +1238,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -1255,7 +1251,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The cause of transmission type. May be either SIZE_1 or SIZE_2 .
+         * The cause of transmission type. May be either SIZE_1 or SIZE_2.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.CauseOfTransmissionType</code> type.
@@ -1268,8 +1264,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option is a:
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
@@ -1282,8 +1277,7 @@ public interface ClientEndpointBuilderFactory {
             return this;
         }
         /**
-         * The information address size. May be either SIZE_1 , SIZE_2 or SIZE_3
-         * .
+         * The information address size. May be either SIZE_1, SIZE_2 or SIZE_3.
          * 
          * The option will be converted to a
          * <code>org.eclipse.neoscada.protocol.iec60870.InformationObjectAddressType</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
index 1025781..62073f6 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CometdEndpointBuilderFactory.java
@@ -25,9 +25,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The cometd component is a transport for working with the Jetty implementation
- * of the cometd/bayeux protocol. Using this component in combination with the
- * dojo toolkit library it's possible to push Camel messages directly into the
- * browser using an AJAX based mechanism.
+ * of the cometd/bayeux protocol.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -1137,9 +1135,7 @@ public interface CometdEndpointBuilderFactory {
         /**
          * CometD (camel-cometd)
          * The cometd component is a transport for working with the Jetty
-         * implementation of the cometd/bayeux protocol. Using this component in
-         * combination with the dojo toolkit library it's possible to push Camel
-         * messages directly into the browser using an AJAX based mechanism.
+         * implementation of the cometd/bayeux protocol.
          * 
          * Category: websocket
          * Since: 2.0
@@ -1163,9 +1159,7 @@ public interface CometdEndpointBuilderFactory {
         /**
          * CometD (Secure) (camel-cometd)
          * The cometd component is a transport for working with the Jetty
-         * implementation of the cometd/bayeux protocol. Using this component in
-         * combination with the dojo toolkit library it's possible to push Camel
-         * messages directly into the browser using an AJAX based mechanism.
+         * implementation of the cometd/bayeux protocol.
          * 
          * Category: websocket
          * Since: 2.0
@@ -1189,9 +1183,7 @@ public interface CometdEndpointBuilderFactory {
         /**
          * CometD (camel-cometd)
          * The cometd component is a transport for working with the Jetty
-         * implementation of the cometd/bayeux protocol. Using this component in
-         * combination with the dojo toolkit library it's possible to push Camel
-         * messages directly into the browser using an AJAX based mechanism.
+         * implementation of the cometd/bayeux protocol.
          * 
          * Category: websocket
          * Since: 2.0
@@ -1204,9 +1196,7 @@ public interface CometdEndpointBuilderFactory {
     /**
      * CometD (camel-cometd)
      * The cometd component is a transport for working with the Jetty
-     * implementation of the cometd/bayeux protocol. Using this component in
-     * combination with the dojo toolkit library it's possible to push Camel
-     * messages directly into the browser using an AJAX based mechanism.
+     * implementation of the cometd/bayeux protocol.
      * 
      * Category: websocket
      * Since: 2.0
@@ -1230,9 +1220,7 @@ public interface CometdEndpointBuilderFactory {
     /**
      * CometD (Secure) (camel-cometd)
      * The cometd component is a transport for working with the Jetty
-     * implementation of the cometd/bayeux protocol. Using this component in
-     * combination with the dojo toolkit library it's possible to push Camel
-     * messages directly into the browser using an AJAX based mechanism.
+     * implementation of the cometd/bayeux protocol.
      * 
      * Category: websocket
      * Since: 2.0
@@ -1256,9 +1244,7 @@ public interface CometdEndpointBuilderFactory {
     /**
      * CometD (camel-cometd)
      * The cometd component is a transport for working with the Jetty
-     * implementation of the cometd/bayeux protocol. Using this component in
-     * combination with the dojo toolkit library it's possible to push Camel
-     * messages directly into the browser using an AJAX based mechanism.
+     * implementation of the cometd/bayeux protocol.
      * 
      * Category: websocket
      * Since: 2.0
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
index df8914b..2aa44c4 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ControlBusEndpointBuilderFactory.java
@@ -24,9 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
  * The controlbus component provides easy management of Camel applications based
- * on the Control Bus EIP pattern. For example, by sending a message to an
- * Endpoint you can control the lifecycle of routes, or gather performance
- * statistics.
+ * on the Control Bus EIP pattern.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -267,9 +265,7 @@ public interface ControlBusEndpointBuilderFactory {
         /**
          * Control Bus (camel-controlbus)
          * The controlbus component provides easy management of Camel
-         * applications based on the Control Bus EIP pattern. For example, by
-         * sending a message to an Endpoint you can control the lifecycle of
-         * routes, or gather performance statistics.
+         * applications based on the Control Bus EIP pattern.
          * 
          * Category: core,monitoring
          * Since: 2.11
@@ -296,9 +292,7 @@ public interface ControlBusEndpointBuilderFactory {
     /**
      * Control Bus (camel-controlbus)
      * The controlbus component provides easy management of Camel applications
-     * based on the Control Bus EIP pattern. For example, by sending a message
-     * to an Endpoint you can control the lifecycle of routes, or gather
-     * performance statistics.
+     * based on the Control Bus EIP pattern.
      * 
      * Category: core,monitoring
      * Since: 2.11
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
index 0465f5a..1db8b13 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CordaEndpointBuilderFactory.java
@@ -80,6 +80,102 @@ public interface CordaEndpointBuilderFactory {
             return this;
         }
         /**
+         * PageSpecification allows specification of a page number (starting
+         * from 1) and page size (defaulting to 200 with a maximum page size of
+         * (Integer.MAX_INT) Note: we default the page number to 200 to enable
+         * queries without requiring a page specification but enabling detection
+         * of large results sets that fall out of the 200 requirement. Max page
+         * size should be used with extreme caution as results may exceed your
+         * JVM memory footprint.
+         * 
+         * The option is a:
+         * <code>net.corda.core.node.services.vault.PageSpecification</code>
+         * type.
+         * 
+         * Default: 200
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder pageSpecification(
+                Object pageSpecification) {
+            doSetProperty("pageSpecification", pageSpecification);
+            return this;
+        }
+        /**
+         * PageSpecification allows specification of a page number (starting
+         * from 1) and page size (defaulting to 200 with a maximum page size of
+         * (Integer.MAX_INT) Note: we default the page number to 200 to enable
+         * queries without requiring a page specification but enabling detection
+         * of large results sets that fall out of the 200 requirement. Max page
+         * size should be used with extreme caution as results may exceed your
+         * JVM memory footprint.
+         * 
+         * The option will be converted to a
+         * <code>net.corda.core.node.services.vault.PageSpecification</code>
+         * type.
+         * 
+         * Default: 200
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder pageSpecification(
+                String pageSpecification) {
+            doSetProperty("pageSpecification", pageSpecification);
+            return this;
+        }
+        /**
+         * Whether to process snapshots or not.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder processSnapshot(
+                boolean processSnapshot) {
+            doSetProperty("processSnapshot", processSnapshot);
+            return this;
+        }
+        /**
+         * Whether to process snapshots or not.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder processSnapshot(
+                String processSnapshot) {
+            doSetProperty("processSnapshot", processSnapshot);
+            return this;
+        }
+        /**
+         * Sort allows specification of a set of entity attribute names and
+         * their associated directionality and null handling, to be applied upon
+         * processing a query specification.
+         * 
+         * The option is a: <code>net.corda.core.node.services.vault.Sort</code>
+         * type.
+         * 
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder sort(Object sort) {
+            doSetProperty("sort", sort);
+            return this;
+        }
+        /**
+         * Sort allows specification of a set of entity attribute names and
+         * their associated directionality and null handling, to be applied upon
+         * processing a query specification.
+         * 
+         * The option will be converted to a
+         * <code>net.corda.core.node.services.vault.Sort</code> type.
+         * 
+         * Group: consumer
+         */
+        default CordaEndpointConsumerBuilder sort(String sort) {
+            doSetProperty("sort", sort);
+            return this;
+        }
+        /**
          * Password for login.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -113,6 +209,46 @@ public interface CordaEndpointBuilderFactory {
             return (CordaEndpointConsumerBuilder) this;
         }
         /**
+         * A contract state (or just state) contains opaque data used by a
+         * contract program. It can be thought of as a disk file that the
+         * program can use to persist data across transactions. States are
+         * immutable: once created they are never updated, instead, any changes
+         * must generate a new successor state. States can be updated (consumed)
+         * only once: the notary is responsible for ensuring there is no double
+         * spending by only signing a transaction if the input states are all
+         * free.
+         * 
+         * The option is a:
+         * <code>java.lang.Class&lt;net.corda.core.contracts.ContractState&gt;</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder contractStateClass(
+                Class<Object> contractStateClass) {
+            doSetProperty("contractStateClass", contractStateClass);
+            return this;
+        }
+        /**
+         * A contract state (or just state) contains opaque data used by a
+         * contract program. It can be thought of as a disk file that the
+         * program can use to persist data across transactions. States are
+         * immutable: once created they are never updated, instead, any changes
+         * must generate a new successor state. States can be updated (consumed)
+         * only once: the notary is responsible for ensuring there is no double
+         * spending by only signing a transaction if the input states are all
+         * free.
+         * 
+         * The option will be converted to a
+         * <code>java.lang.Class&lt;net.corda.core.contracts.ContractState&gt;</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder contractStateClass(
+                String contractStateClass) {
+            doSetProperty("contractStateClass", contractStateClass);
+            return this;
+        }
+        /**
          * To let the consumer use a custom ExceptionHandler. Notice if the
          * option bridgeErrorHandler is enabled then this option is not in use.
          * By default the consumer will deal with exceptions, that will be
@@ -170,6 +306,97 @@ public interface CordaEndpointBuilderFactory {
             return this;
         }
         /**
+         * Start the given flow with the given arguments, returning an
+         * Observable with a single observation of the result of running the
+         * flow. The flowLogicClass must be annotated with
+         * net.corda.core.flows.StartableByRPC.
+         * 
+         * The option is a: <code>java.lang.Object[]</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder flowLogicArguments(
+                Object[] flowLogicArguments) {
+            doSetProperty("flowLogicArguments", flowLogicArguments);
+            return this;
+        }
+        /**
+         * Start the given flow with the given arguments, returning an
+         * Observable with a single observation of the result of running the
+         * flow. The flowLogicClass must be annotated with
+         * net.corda.core.flows.StartableByRPC.
+         * 
+         * The option will be converted to a <code>java.lang.Object[]</code>
+         * type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder flowLogicArguments(
+                String flowLogicArguments) {
+            doSetProperty("flowLogicArguments", flowLogicArguments);
+            return this;
+        }
+        /**
+         * Start the given flow with the given arguments, returning an
+         * Observable with a single observation of the result of running the
+         * flow. The flowLogicClass must be annotated with
+         * net.corda.core.flows.StartableByRPC.
+         * 
+         * The option is a:
+         * <code>java.lang.Class&lt;net.corda.core.flows.FlowLogic&lt;java.lang.Object&gt;&gt;</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder flowLogicClass(
+                Class<Object> flowLogicClass) {
+            doSetProperty("flowLogicClass", flowLogicClass);
+            return this;
+        }
+        /**
+         * Start the given flow with the given arguments, returning an
+         * Observable with a single observation of the result of running the
+         * flow. The flowLogicClass must be annotated with
+         * net.corda.core.flows.StartableByRPC.
+         * 
+         * The option will be converted to a
+         * <code>java.lang.Class&lt;net.corda.core.flows.FlowLogic&lt;java.lang.Object&gt;&gt;</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder flowLogicClass(
+                String flowLogicClass) {
+            doSetProperty("flowLogicClass", flowLogicClass);
+            return this;
+        }
+        /**
+         * QueryCriteria assumes underlying schema tables are correctly indexed
+         * for performance.
+         * 
+         * The option is a:
+         * <code>net.corda.core.node.services.vault.QueryCriteria</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder queryCriteria(
+                Object queryCriteria) {
+            doSetProperty("queryCriteria", queryCriteria);
+            return this;
+        }
+        /**
+         * QueryCriteria assumes underlying schema tables are correctly indexed
+         * for performance.
+         * 
+         * The option will be converted to a
+         * <code>net.corda.core.node.services.vault.QueryCriteria</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCordaEndpointConsumerBuilder queryCriteria(
+                String queryCriteria) {
+            doSetProperty("queryCriteria", queryCriteria);
+            return this;
+        }
+        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
index 6a05317..2c05929 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CryptoCmsEndpointBuilderFactory.java
@@ -146,7 +146,7 @@ public interface CryptoCmsEndpointBuilderFactory {
          * Sets the password of the private keys. It is assumed that all private
          * keys in the keystore have the same password. If not set then it is
          * assumed that the password of the private keys is given by the
-         * keystore password given in the KeyStoreParameters .
+         * keystore password given in the KeyStoreParameters.
          * 
          * The option is a: <code>char[]</code> type.
          * 
@@ -160,7 +160,7 @@ public interface CryptoCmsEndpointBuilderFactory {
          * Sets the password of the private keys. It is assumed that all private
          * keys in the keystore have the same password. If not set then it is
          * assumed that the password of the private keys is given by the
-         * keystore password given in the KeyStoreParameters .
+         * keystore password given in the KeyStoreParameters.
          * 
          * The option will be converted to a <code>char[]</code> type.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
similarity index 60%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
index e3b210d..f35ab5e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Cw2EndpointBuilderFactory.java
@@ -16,60 +16,50 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.time.Instant;
 import javax.annotation.Generated;
 import org.apache.camel.builder.EndpointConsumerBuilder;
 import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws-eks is used for managing Amazon EKS
+ * The aws2-cw component is used for sending metrics to an Amazon CloudWatch.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface EKS2EndpointBuilderFactory {
+public interface Cw2EndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the AWS 2 EKS component.
+     * Builder for endpoint for the AWS 2 CloudWatch component.
      */
-    public interface EKS2EndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedEKS2EndpointBuilder advanced() {
-            return (AdvancedEKS2EndpointBuilder) this;
+    public interface Cw2EndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedCw2EndpointBuilder advanced() {
+            return (AdvancedCw2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: producer
-         */
-        default EKS2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
-         * To use a existing configured AWS EKS as client.
+         * To use the AmazonCloudWatch as the client.
          * 
          * The option is a:
-         * <code>software.amazon.awssdk.services.eks.EksClient</code> type.
+         * <code>software.amazon.awssdk.services.cloudwatch.CloudWatchClient</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder eksClient(Object eksClient) {
-            doSetProperty("eksClient", eksClient);
+        default Cw2EndpointBuilder amazonCwClient(Object amazonCwClient) {
+            doSetProperty("amazonCwClient", amazonCwClient);
             return this;
         }
         /**
-         * To use a existing configured AWS EKS as client.
+         * To use the AmazonCloudWatch as the client.
          * 
          * The option will be converted to a
-         * <code>software.amazon.awssdk.services.eks.EksClient</code> type.
+         * <code>software.amazon.awssdk.services.cloudwatch.CloudWatchClient</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder eksClient(String eksClient) {
-            doSetProperty("eksClient", eksClient);
+        default Cw2EndpointBuilder amazonCwClient(String amazonCwClient) {
+            doSetProperty("amazonCwClient", amazonCwClient);
             return this;
         }
         /**
@@ -88,7 +78,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EKS2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
+        default Cw2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -108,72 +98,57 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EKS2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
+        default Cw2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
         /**
-         * The operation to perform.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> type.
-         * 
-         * Required: true
-         * Group: producer
-         */
-        default EKS2EndpointBuilder operation(EKS2Operations operation) {
-            doSetProperty("operation", operation);
-            return this;
-        }
-        /**
-         * The operation to perform.
+         * The metric name.
          * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Required: true
          * Group: producer
          */
-        default EKS2EndpointBuilder operation(String operation) {
-            doSetProperty("operation", operation);
+        default Cw2EndpointBuilder name(String name) {
+            doSetProperty("name", name);
             return this;
         }
         /**
-         * To define a proxy host when instantiating the EKS client.
+         * To define a proxy host when instantiating the CW client.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyHost(String proxyHost) {
+        default Cw2EndpointBuilder proxyHost(String proxyHost) {
             doSetProperty("proxyHost", proxyHost);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the EKS client.
+         * To define a proxy port when instantiating the CW client.
          * 
          * The option is a: <code>java.lang.Integer</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyPort(Integer proxyPort) {
+        default Cw2EndpointBuilder proxyPort(Integer proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the EKS client.
+         * To define a proxy port when instantiating the CW client.
          * 
          * The option will be converted to a <code>java.lang.Integer</code>
          * type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyPort(String proxyPort) {
+        default Cw2EndpointBuilder proxyPort(String proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the EKS client.
+         * To define a proxy protocol when instantiating the CW client.
          * 
          * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
          * type.
@@ -181,12 +156,12 @@ public interface EKS2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default Cw2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the EKS client.
+         * To define a proxy protocol when instantiating the CW client.
          * 
          * The option will be converted to a
          * <code>software.amazon.awssdk.core.Protocol</code> type.
@@ -194,7 +169,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyProtocol(String proxyProtocol) {
+        default Cw2EndpointBuilder proxyProtocol(String proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
@@ -208,31 +183,98 @@ public interface EKS2EndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder region(String region) {
+        default Cw2EndpointBuilder region(String region) {
             doSetProperty("region", region);
             return this;
         }
         /**
-         * Amazon AWS Secret Key.
+         * The metric timestamp.
+         * 
+         * The option is a: <code>java.time.Instant</code> type.
+         * 
+         * Group: producer
+         */
+        default Cw2EndpointBuilder timestamp(Instant timestamp) {
+            doSetProperty("timestamp", timestamp);
+            return this;
+        }
+        /**
+         * The metric timestamp.
+         * 
+         * The option will be converted to a <code>java.time.Instant</code>
+         * type.
+         * 
+         * Group: producer
+         */
+        default Cw2EndpointBuilder timestamp(String timestamp) {
+            doSetProperty("timestamp", timestamp);
+            return this;
+        }
+        /**
+         * The metric unit.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder secretKey(String secretKey) {
+        default Cw2EndpointBuilder unit(String unit) {
+            doSetProperty("unit", unit);
+            return this;
+        }
+        /**
+         * The metric value.
+         * 
+         * The option is a: <code>java.lang.Double</code> type.
+         * 
+         * Group: producer
+         */
+        default Cw2EndpointBuilder value(Double value) {
+            doSetProperty("value", value);
+            return this;
+        }
+        /**
+         * The metric value.
+         * 
+         * The option will be converted to a <code>java.lang.Double</code> type.
+         * 
+         * Group: producer
+         */
+        default Cw2EndpointBuilder value(String value) {
+            doSetProperty("value", value);
+            return this;
+        }
+        /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Cw2EndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
+         * Amazon AWS Secret Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Cw2EndpointBuilder secretKey(String secretKey) {
             doSetProperty("secretKey", secretKey);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the AWS 2 EKS component.
+     * Advanced builder for endpoint for the AWS 2 CloudWatch component.
      */
-    public interface AdvancedEKS2EndpointBuilder
+    public interface AdvancedCw2EndpointBuilder
             extends
                 EndpointProducerBuilder {
-        default EKS2EndpointBuilder basic() {
-            return (EKS2EndpointBuilder) this;
+        default Cw2EndpointBuilder basic() {
+            return (Cw2EndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -243,7 +285,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEKS2EndpointBuilder basicPropertyBinding(
+        default AdvancedCw2EndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -257,7 +299,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEKS2EndpointBuilder basicPropertyBinding(
+        default AdvancedCw2EndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -271,7 +313,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEKS2EndpointBuilder synchronous(boolean synchronous) {
+        default AdvancedCw2EndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -284,24 +326,13 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEKS2EndpointBuilder synchronous(String synchronous) {
+        default AdvancedCw2EndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
     /**
-     * Proxy enum for
-     * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> enum.
-     */
-    enum EKS2Operations {
-        listClusters,
-        describeCluster,
-        createCluster,
-        deleteCluster;
-    }
-
-    /**
      * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
      */
     enum Protocol {
@@ -309,43 +340,45 @@ public interface EKS2EndpointBuilderFactory {
         https;
     }
 
-    public interface EKS2Builders {
+    public interface Cw2Builders {
         /**
-         * AWS 2 EKS (camel-aws2-eks)
-         * The aws-eks is used for managing Amazon EKS
+         * AWS 2 CloudWatch (camel-aws2-cw)
+         * The aws2-cw component is used for sending metrics to an Amazon
+         * CloudWatch.
          * 
-         * Category: cloud,management
+         * Category: cloud,monitoring
          * Since: 3.1
-         * Maven coordinates: org.apache.camel:camel-aws2-eks
+         * Maven coordinates: org.apache.camel:camel-aws2-cw
          * 
-         * Syntax: <code>aws2-eks:label</code>
+         * Syntax: <code>aws2-cw:namespace</code>
          * 
-         * Path parameter: label (required)
-         * Logical name
+         * Path parameter: namespace (required)
+         * The metric namespace
          */
-        default EKS2EndpointBuilder aws2Eks(String path) {
-            return EKS2EndpointBuilderFactory.aws2Eks(path);
+        default Cw2EndpointBuilder aws2Cw(String path) {
+            return Cw2EndpointBuilderFactory.aws2Cw(path);
         }
     }
     /**
-     * AWS 2 EKS (camel-aws2-eks)
-     * The aws-eks is used for managing Amazon EKS
+     * AWS 2 CloudWatch (camel-aws2-cw)
+     * The aws2-cw component is used for sending metrics to an Amazon
+     * CloudWatch.
      * 
-     * Category: cloud,management
+     * Category: cloud,monitoring
      * Since: 3.1
-     * Maven coordinates: org.apache.camel:camel-aws2-eks
+     * Maven coordinates: org.apache.camel:camel-aws2-cw
      * 
-     * Syntax: <code>aws2-eks:label</code>
+     * Syntax: <code>aws2-cw:namespace</code>
      * 
-     * Path parameter: label (required)
-     * Logical name
+     * Path parameter: namespace (required)
+     * The metric namespace
      */
-    static EKS2EndpointBuilder aws2Eks(String path) {
-        class EKS2EndpointBuilderImpl extends AbstractEndpointBuilder implements EKS2EndpointBuilder, AdvancedEKS2EndpointBuilder {
-            public EKS2EndpointBuilderImpl(String path) {
-                super("aws2-eks", path);
+    static Cw2EndpointBuilder aws2Cw(String path) {
+        class Cw2EndpointBuilderImpl extends AbstractEndpointBuilder implements Cw2EndpointBuilder, AdvancedCw2EndpointBuilder {
+            public Cw2EndpointBuilderImpl(String path) {
+                super("aws2-cw", path);
             }
         }
-        return new EKS2EndpointBuilderImpl(path);
+        return new Cw2EndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
index 31760e6..4b0a967 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/CxfRsEndpointBuilderFactory.java
@@ -253,7 +253,7 @@ public interface CxfRsEndpointBuilderFactory {
          * values are possible: SimpleConsumer: This binding style processes
          * request parameters, multiparts, etc. and maps them to IN headers, IN
          * attachments and to the message body. It aims to eliminate low-level
-         * processing of org.apache.cxf.message.MessageContentsList . It also
+         * processing of org.apache.cxf.message.MessageContentsList. It also
          * also adds more flexibility and simplicity to the response mapping.
          * Only available for consumers. Default: The default style. For
          * consumers this passes on a MessageContentsList to the route,
@@ -281,7 +281,7 @@ public interface CxfRsEndpointBuilderFactory {
          * values are possible: SimpleConsumer: This binding style processes
          * request parameters, multiparts, etc. and maps them to IN headers, IN
          * attachments and to the message body. It aims to eliminate low-level
-         * processing of org.apache.cxf.message.MessageContentsList . It also
+         * processing of org.apache.cxf.message.MessageContentsList. It also
          * also adds more flexibility and simplicity to the response mapping.
          * Only available for consumers. Default: The default style. For
          * consumers this passes on a MessageContentsList to the route,
@@ -427,7 +427,23 @@ public interface CxfRsEndpointBuilderFactory {
          * want to export as REST service. Multiple beans can be separated by
          * comma.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.util.List&lt;java.lang.Object&gt;</code>
+         * type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedCxfRsEndpointConsumerBuilder serviceBeans(
+                List<Object> serviceBeans) {
+            doSetProperty("serviceBeans", serviceBeans);
+            return this;
+        }
+        /**
+         * The service beans (the bean ids to lookup in the registry) which you
+         * want to export as REST service. Multiple beans can be separated by
+         * comma.
+         * 
+         * The option will be converted to a
+         * <code>java.util.List&lt;java.lang.Object&gt;</code> type.
          * 
          * Group: consumer (advanced)
          */
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
index a9bbc4d..811d035 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
@@ -25,9 +25,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The dataset component provides a mechanism to easily perform load & soak
- * testing of your system. It works by allowing you to create DataSet instances
- * both as a source of messages and as a way to assert that the data set is
- * received. Camel will use the throughput logger when sending dataset's.
+ * testing of your system.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -423,7 +421,7 @@ public interface DataSetEndpointBuilderFactory {
          * messages, then take extra care, as 0 matches when the tests starts,
          * so you need to set a assert period time to let the test run for a
          * while to make sure there are still no messages arrived; for that use
-         * setAssertPeriod(long) . An alternative is to use NotifyBuilder, and
+         * setAssertPeriod(long). An alternative is to use NotifyBuilder, and
          * use the notifier to know when Camel is done routing some messages,
          * before you call the assertIsSatisfied() method on the mocks. This
          * allows you to not use a fixed assert period, to speedup testing
@@ -446,7 +444,7 @@ public interface DataSetEndpointBuilderFactory {
          * messages, then take extra care, as 0 matches when the tests starts,
          * so you need to set a assert period time to let the test run for a
          * while to make sure there are still no messages arrived; for that use
-         * setAssertPeriod(long) . An alternative is to use NotifyBuilder, and
+         * setAssertPeriod(long). An alternative is to use NotifyBuilder, and
          * use the notifier to know when Camel is done routing some messages,
          * before you call the assertIsSatisfied() method on the mocks. This
          * allows you to not use a fixed assert period, to speedup testing
@@ -619,21 +617,20 @@ public interface DataSetEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the first n'th number of received Exchange
-         * s. This is used when testing with big data, to reduce memory
-         * consumption by not storing copies of every Exchange this mock
-         * endpoint receives. Important: When using this limitation, then the
-         * getReceivedCounter() will still return the actual number of received
-         * Exchange s. For example if we have received 5000 Exchange s, and have
-         * configured to only retain the first 10 Exchange s, then the
-         * getReceivedCounter() will still return 5000 but there is only the
-         * first 10 Exchange s in the getExchanges() and getReceivedExchanges()
-         * methods. When using this method, then some of the other expectation
-         * methods is not supported, for example the
-         * expectedBodiesReceived(Object) sets a expectation on the first number
-         * of bodies received. You can configure both setRetainFirst(int) and
-         * setRetainLast(int) methods, to limit both the first and last
-         * received.
+         * Specifies to only retain the first n'th number of received Exchanges.
+         * This is used when testing with big data, to reduce memory consumption
+         * by not storing copies of every Exchange this mock endpoint receives.
+         * Important: When using this limitation, then the getReceivedCounter()
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the first 10 Exchanges, then the getReceivedCounter()
+         * will still return 5000 but there is only the first 10 Exchanges in
+         * the getExchanges() and getReceivedExchanges() methods. When using
+         * this method, then some of the other expectation methods is not
+         * supported, for example the expectedBodiesReceived(Object...) sets a
+         * expectation on the first number of bodies received. You can configure
+         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
+         * both the first and last received.
          * 
          * The option is a: <code>int</code> type.
          * 
@@ -645,21 +642,20 @@ public interface DataSetEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the first n'th number of received Exchange
-         * s. This is used when testing with big data, to reduce memory
-         * consumption by not storing copies of every Exchange this mock
-         * endpoint receives. Important: When using this limitation, then the
-         * getReceivedCounter() will still return the actual number of received
-         * Exchange s. For example if we have received 5000 Exchange s, and have
-         * configured to only retain the first 10 Exchange s, then the
-         * getReceivedCounter() will still return 5000 but there is only the
-         * first 10 Exchange s in the getExchanges() and getReceivedExchanges()
-         * methods. When using this method, then some of the other expectation
-         * methods is not supported, for example the
-         * expectedBodiesReceived(Object) sets a expectation on the first number
-         * of bodies received. You can configure both setRetainFirst(int) and
-         * setRetainLast(int) methods, to limit both the first and last
-         * received.
+         * Specifies to only retain the first n'th number of received Exchanges.
+         * This is used when testing with big data, to reduce memory consumption
+         * by not storing copies of every Exchange this mock endpoint receives.
+         * Important: When using this limitation, then the getReceivedCounter()
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the first 10 Exchanges, then the getReceivedCounter()
+         * will still return 5000 but there is only the first 10 Exchanges in
+         * the getExchanges() and getReceivedExchanges() methods. When using
+         * this method, then some of the other expectation methods is not
+         * supported, for example the expectedBodiesReceived(Object...) sets a
+         * expectation on the first number of bodies received. You can configure
+         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
+         * both the first and last received.
          * 
          * The option will be converted to a <code>int</code> type.
          * 
@@ -671,20 +667,20 @@ public interface DataSetEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the last n'th number of received Exchange s.
+         * Specifies to only retain the last n'th number of received Exchanges.
          * This is used when testing with big data, to reduce memory consumption
          * by not storing copies of every Exchange this mock endpoint receives.
          * Important: When using this limitation, then the getReceivedCounter()
-         * will still return the actual number of received Exchange s. For
-         * example if we have received 5000 Exchange s, and have configured to
-         * only retain the last 20 Exchange s, then the getReceivedCounter()
-         * will still return 5000 but there is only the last 20 Exchange s in
-         * the getExchanges() and getReceivedExchanges() methods. When using
-         * this method, then some of the other expectation methods is not
-         * supported, for example the expectedBodiesReceived(Object) sets a
-         * expectation on the first number of bodies received. You can configure
-         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
-         * both the first and last received.
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the last 20 Exchanges, then the getReceivedCounter() will
+         * still return 5000 but there is only the last 20 Exchanges in the
+         * getExchanges() and getReceivedExchanges() methods. When using this
+         * method, then some of the other expectation methods is not supported,
+         * for example the expectedBodiesReceived(Object...) sets a expectation
+         * on the first number of bodies received. You can configure both
+         * setRetainFirst(int) and setRetainLast(int) methods, to limit both the
+         * first and last received.
          * 
          * The option is a: <code>int</code> type.
          * 
@@ -696,20 +692,20 @@ public interface DataSetEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the last n'th number of received Exchange s.
+         * Specifies to only retain the last n'th number of received Exchanges.
          * This is used when testing with big data, to reduce memory consumption
          * by not storing copies of every Exchange this mock endpoint receives.
          * Important: When using this limitation, then the getReceivedCounter()
-         * will still return the actual number of received Exchange s. For
-         * example if we have received 5000 Exchange s, and have configured to
-         * only retain the last 20 Exchange s, then the getReceivedCounter()
-         * will still return 5000 but there is only the last 20 Exchange s in
-         * the getExchanges() and getReceivedExchanges() methods. When using
-         * this method, then some of the other expectation methods is not
-         * supported, for example the expectedBodiesReceived(Object) sets a
-         * expectation on the first number of bodies received. You can configure
-         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
-         * both the first and last received.
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the last 20 Exchanges, then the getReceivedCounter() will
+         * still return 5000 but there is only the last 20 Exchanges in the
+         * getExchanges() and getReceivedExchanges() methods. When using this
+         * method, then some of the other expectation methods is not supported,
+         * for example the expectedBodiesReceived(Object...) sets a expectation
+         * on the first number of bodies received. You can configure both
+         * setRetainFirst(int) and setRetainLast(int) methods, to limit both the
+         * first and last received.
          * 
          * The option will be converted to a <code>int</code> type.
          * 
@@ -945,10 +941,7 @@ public interface DataSetEndpointBuilderFactory {
         /**
          * Dataset (camel-dataset)
          * The dataset component provides a mechanism to easily perform load &
-         * soak testing of your system. It works by allowing you to create
-         * DataSet instances both as a source of messages and as a way to assert
-         * that the data set is received. Camel will use the throughput logger
-         * when sending dataset's.
+         * soak testing of your system.
          * 
          * Category: core,testing
          * Since: 1.3
@@ -966,10 +959,7 @@ public interface DataSetEndpointBuilderFactory {
     /**
      * Dataset (camel-dataset)
      * The dataset component provides a mechanism to easily perform load & soak
-     * testing of your system. It works by allowing you to create DataSet
-     * instances both as a source of messages and as a way to assert that the
-     * data set is received. Camel will use the throughput logger when sending
-     * dataset's.
+     * testing of your system.
      * 
      * Category: core,testing
      * Since: 1.3
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
index 39fef19..5cf96a9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetTestEndpointBuilderFactory.java
@@ -23,13 +23,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
  * The dataset-test component extends the mock component by on startup to pull
- * messages from another endpoint to set the expected message bodies. That is,
- * you use the test endpoint in a route and messages arriving on it will be
- * implicitly compared to some expected messages extracted from some other
- * location. So you can use, for example, an expected set of message bodies as
- * files. This will then set up a properly configured Mock endpoint, which is
- * only valid if the received messages match the number of expected messages and
- * their message payloads are equal.
+ * messages from another endpoint to set the expected message bodies.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -129,7 +123,7 @@ public interface DataSetTestEndpointBuilderFactory {
          * messages, then take extra care, as 0 matches when the tests starts,
          * so you need to set a assert period time to let the test run for a
          * while to make sure there are still no messages arrived; for that use
-         * setAssertPeriod(long) . An alternative is to use NotifyBuilder, and
+         * setAssertPeriod(long). An alternative is to use NotifyBuilder, and
          * use the notifier to know when Camel is done routing some messages,
          * before you call the assertIsSatisfied() method on the mocks. This
          * allows you to not use a fixed assert period, to speedup testing
@@ -152,7 +146,7 @@ public interface DataSetTestEndpointBuilderFactory {
          * messages, then take extra care, as 0 matches when the tests starts,
          * so you need to set a assert period time to let the test run for a
          * while to make sure there are still no messages arrived; for that use
-         * setAssertPeriod(long) . An alternative is to use NotifyBuilder, and
+         * setAssertPeriod(long). An alternative is to use NotifyBuilder, and
          * use the notifier to know when Camel is done routing some messages,
          * before you call the assertIsSatisfied() method on the mocks. This
          * allows you to not use a fixed assert period, to speedup testing
@@ -322,21 +316,20 @@ public interface DataSetTestEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the first n'th number of received Exchange
-         * s. This is used when testing with big data, to reduce memory
-         * consumption by not storing copies of every Exchange this mock
-         * endpoint receives. Important: When using this limitation, then the
-         * getReceivedCounter() will still return the actual number of received
-         * Exchange s. For example if we have received 5000 Exchange s, and have
-         * configured to only retain the first 10 Exchange s, then the
-         * getReceivedCounter() will still return 5000 but there is only the
-         * first 10 Exchange s in the getExchanges() and getReceivedExchanges()
-         * methods. When using this method, then some of the other expectation
-         * methods is not supported, for example the
-         * expectedBodiesReceived(Object) sets a expectation on the first number
-         * of bodies received. You can configure both setRetainFirst(int) and
-         * setRetainLast(int) methods, to limit both the first and last
-         * received.
+         * Specifies to only retain the first n'th number of received Exchanges.
+         * This is used when testing with big data, to reduce memory consumption
+         * by not storing copies of every Exchange this mock endpoint receives.
+         * Important: When using this limitation, then the getReceivedCounter()
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the first 10 Exchanges, then the getReceivedCounter()
+         * will still return 5000 but there is only the first 10 Exchanges in
+         * the getExchanges() and getReceivedExchanges() methods. When using
+         * this method, then some of the other expectation methods is not
+         * supported, for example the expectedBodiesReceived(Object...) sets a
+         * expectation on the first number of bodies received. You can configure
+         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
+         * both the first and last received.
          * 
          * The option is a: <code>int</code> type.
          * 
@@ -348,21 +341,20 @@ public interface DataSetTestEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the first n'th number of received Exchange
-         * s. This is used when testing with big data, to reduce memory
-         * consumption by not storing copies of every Exchange this mock
-         * endpoint receives. Important: When using this limitation, then the
-         * getReceivedCounter() will still return the actual number of received
-         * Exchange s. For example if we have received 5000 Exchange s, and have
-         * configured to only retain the first 10 Exchange s, then the
-         * getReceivedCounter() will still return 5000 but there is only the
-         * first 10 Exchange s in the getExchanges() and getReceivedExchanges()
-         * methods. When using this method, then some of the other expectation
-         * methods is not supported, for example the
-         * expectedBodiesReceived(Object) sets a expectation on the first number
-         * of bodies received. You can configure both setRetainFirst(int) and
-         * setRetainLast(int) methods, to limit both the first and last
-         * received.
+         * Specifies to only retain the first n'th number of received Exchanges.
+         * This is used when testing with big data, to reduce memory consumption
+         * by not storing copies of every Exchange this mock endpoint receives.
+         * Important: When using this limitation, then the getReceivedCounter()
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the first 10 Exchanges, then the getReceivedCounter()
+         * will still return 5000 but there is only the first 10 Exchanges in
+         * the getExchanges() and getReceivedExchanges() methods. When using
+         * this method, then some of the other expectation methods is not
+         * supported, for example the expectedBodiesReceived(Object...) sets a
+         * expectation on the first number of bodies received. You can configure
+         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
+         * both the first and last received.
          * 
          * The option will be converted to a <code>int</code> type.
          * 
@@ -374,20 +366,20 @@ public interface DataSetTestEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the last n'th number of received Exchange s.
+         * Specifies to only retain the last n'th number of received Exchanges.
          * This is used when testing with big data, to reduce memory consumption
          * by not storing copies of every Exchange this mock endpoint receives.
          * Important: When using this limitation, then the getReceivedCounter()
-         * will still return the actual number of received Exchange s. For
-         * example if we have received 5000 Exchange s, and have configured to
-         * only retain the last 20 Exchange s, then the getReceivedCounter()
-         * will still return 5000 but there is only the last 20 Exchange s in
-         * the getExchanges() and getReceivedExchanges() methods. When using
-         * this method, then some of the other expectation methods is not
-         * supported, for example the expectedBodiesReceived(Object) sets a
-         * expectation on the first number of bodies received. You can configure
-         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
-         * both the first and last received.
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the last 20 Exchanges, then the getReceivedCounter() will
+         * still return 5000 but there is only the last 20 Exchanges in the
+         * getExchanges() and getReceivedExchanges() methods. When using this
+         * method, then some of the other expectation methods is not supported,
+         * for example the expectedBodiesReceived(Object...) sets a expectation
+         * on the first number of bodies received. You can configure both
+         * setRetainFirst(int) and setRetainLast(int) methods, to limit both the
+         * first and last received.
          * 
          * The option is a: <code>int</code> type.
          * 
@@ -399,20 +391,20 @@ public interface DataSetTestEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies to only retain the last n'th number of received Exchange s.
+         * Specifies to only retain the last n'th number of received Exchanges.
          * This is used when testing with big data, to reduce memory consumption
          * by not storing copies of every Exchange this mock endpoint receives.
          * Important: When using this limitation, then the getReceivedCounter()
-         * will still return the actual number of received Exchange s. For
-         * example if we have received 5000 Exchange s, and have configured to
-         * only retain the last 20 Exchange s, then the getReceivedCounter()
-         * will still return 5000 but there is only the last 20 Exchange s in
-         * the getExchanges() and getReceivedExchanges() methods. When using
-         * this method, then some of the other expectation methods is not
-         * supported, for example the expectedBodiesReceived(Object) sets a
-         * expectation on the first number of bodies received. You can configure
-         * both setRetainFirst(int) and setRetainLast(int) methods, to limit
-         * both the first and last received.
+         * will still return the actual number of received Exchanges. For
+         * example if we have received 5000 Exchanges, and have configured to
+         * only retain the last 20 Exchanges, then the getReceivedCounter() will
+         * still return 5000 but there is only the last 20 Exchanges in the
+         * getExchanges() and getReceivedExchanges() methods. When using this
+         * method, then some of the other expectation methods is not supported,
+         * for example the expectedBodiesReceived(Object...) sets a expectation
+         * on the first number of bodies received. You can configure both
+         * setRetainFirst(int) and setRetainLast(int) methods, to limit both the
+         * first and last received.
          * 
          * The option will be converted to a <code>int</code> type.
          * 
@@ -607,13 +599,7 @@ public interface DataSetTestEndpointBuilderFactory {
          * DataSet Test (camel-dataset)
          * The dataset-test component extends the mock component by on startup
          * to pull messages from another endpoint to set the expected message
-         * bodies. That is, you use the test endpoint in a route and messages
-         * arriving on it will be implicitly compared to some expected messages
-         * extracted from some other location. So you can use, for example, an
-         * expected set of message bodies as files. This will then set up a
-         * properly configured Mock endpoint, which is only valid if the
-         * received messages match the number of expected messages and their
-         * message payloads are equal.
+         * bodies.
          * 
          * Category: core,testing
          * Since: 1.3
@@ -633,12 +619,6 @@ public interface DataSetTestEndpointBuilderFactory {
      * DataSet Test (camel-dataset)
      * The dataset-test component extends the mock component by on startup to
      * pull messages from another endpoint to set the expected message bodies.
-     * That is, you use the test endpoint in a route and messages arriving on it
-     * will be implicitly compared to some expected messages extracted from some
-     * other location. So you can use, for example, an expected set of message
-     * bodies as files. This will then set up a properly configured Mock
-     * endpoint, which is only valid if the received messages match the number
-     * of expected messages and their message payloads are equal.
      * 
      * Category: core,testing
      * Since: 1.3
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
similarity index 55%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
index 09ae4aa..39c717f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Translate2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2EndpointBuilderFactory.java
@@ -22,58 +22,94 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws2-translate component is used for managing Amazon Translate
+ * The aws2-ddb component is used for storing and retrieving data from Amazon's
+ * DynamoDB service.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface Translate2EndpointBuilderFactory {
+public interface Ddb2EndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the AWS 2 Translate component.
+     * Builder for endpoint for the AWS 2 DynamoDB component.
      */
-    public interface Translate2EndpointBuilder
-            extends
-                EndpointProducerBuilder {
-        default AdvancedTranslate2EndpointBuilder advanced() {
-            return (AdvancedTranslate2EndpointBuilder) this;
+    public interface Ddb2EndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedDdb2EndpointBuilder advanced() {
+            return (AdvancedDdb2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
+         * To use the AmazonDynamoDB as the client.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a:
+         * <code>software.amazon.awssdk.services.dynamodb.DynamoDbClient</code>
+         * type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
+        default Ddb2EndpointBuilder amazonDDBClient(Object amazonDDBClient) {
+            doSetProperty("amazonDDBClient", amazonDDBClient);
+            return this;
+        }
+        /**
+         * To use the AmazonDynamoDB as the client.
+         * 
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.services.dynamodb.DynamoDbClient</code>
+         * type.
+         * 
+         * Group: producer
+         */
+        default Ddb2EndpointBuilder amazonDDBClient(String amazonDDBClient) {
+            doSetProperty("amazonDDBClient", amazonDDBClient);
             return this;
         }
         /**
-         * Being able to autodetect the source language.
+         * Determines whether or not strong consistency should be enforced when
+         * data is read.
          * 
          * The option is a: <code>boolean</code> type.
          * 
          * Default: false
          * Group: producer
          */
-        default Translate2EndpointBuilder autodetectSourceLanguage(
-                boolean autodetectSourceLanguage) {
-            doSetProperty("autodetectSourceLanguage", autodetectSourceLanguage);
+        default Ddb2EndpointBuilder consistentRead(boolean consistentRead) {
+            doSetProperty("consistentRead", consistentRead);
             return this;
         }
         /**
-         * Being able to autodetect the source language.
+         * Determines whether or not strong consistency should be enforced when
+         * data is read.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
          * Default: false
          * Group: producer
          */
-        default Translate2EndpointBuilder autodetectSourceLanguage(
-                String autodetectSourceLanguage) {
-            doSetProperty("autodetectSourceLanguage", autodetectSourceLanguage);
+        default Ddb2EndpointBuilder consistentRead(String consistentRead) {
+            doSetProperty("consistentRead", consistentRead);
+            return this;
+        }
+        /**
+         * Attribute name when creating table.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: producer
+         */
+        default Ddb2EndpointBuilder keyAttributeName(String keyAttributeName) {
+            doSetProperty("keyAttributeName", keyAttributeName);
+            return this;
+        }
+        /**
+         * Attribute type when creating table.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: producer
+         */
+        default Ddb2EndpointBuilder keyAttributeType(String keyAttributeType) {
+            doSetProperty("keyAttributeType", keyAttributeType);
             return this;
         }
         /**
@@ -92,8 +128,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default Translate2EndpointBuilder lazyStartProducer(
-                boolean lazyStartProducer) {
+        default Ddb2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -113,76 +148,78 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default Translate2EndpointBuilder lazyStartProducer(
-                String lazyStartProducer) {
+        default Ddb2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
         /**
-         * The operation to perform.
+         * What operation to perform.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.aws2.translate.Translate2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.ddb.Ddb2Operations</code> type.
          * 
-         * Required: true
-         * Default: translateText
+         * Default: PutItem
          * Group: producer
          */
-        default Translate2EndpointBuilder operation(
-                Translate2Operations operation) {
+        default Ddb2EndpointBuilder operation(Ddb2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
         /**
-         * The operation to perform.
+         * What operation to perform.
          * 
          * The option will be converted to a
-         * <code>org.apache.camel.component.aws2.translate.Translate2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.ddb.Ddb2Operations</code> type.
          * 
-         * Required: true
-         * Default: translateText
+         * Default: PutItem
          * Group: producer
          */
-        default Translate2EndpointBuilder operation(String operation) {
+        default Ddb2EndpointBuilder operation(String operation) {
             doSetProperty("operation", operation);
             return this;
         }
         /**
-         * To define a proxy host when instantiating the Translate client.
+         * To define a proxy host when instantiating the DDB client.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyHost(String proxyHost) {
+        default Ddb2EndpointBuilder proxyHost(String proxyHost) {
             doSetProperty("proxyHost", proxyHost);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the Translate client.
+         * The region in which DynamoDB client needs to work. When using this
+         * parameter, the configuration will expect the lowercase name of the
+         * region (for example ap-east-1) You'll need to use the name
+         * Region.EU_WEST_1.id().
          * 
          * The option is a: <code>java.lang.Integer</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyPort(Integer proxyPort) {
+        default Ddb2EndpointBuilder proxyPort(Integer proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the Translate client.
+         * The region in which DynamoDB client needs to work. When using this
+         * parameter, the configuration will expect the lowercase name of the
+         * region (for example ap-east-1) You'll need to use the name
+         * Region.EU_WEST_1.id().
          * 
          * The option will be converted to a <code>java.lang.Integer</code>
          * type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyPort(String proxyPort) {
+        default Ddb2EndpointBuilder proxyPort(String proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the Translate client.
+         * To define a proxy protocol when instantiating the DDB client.
          * 
          * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
          * type.
@@ -190,12 +227,12 @@ public interface Translate2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default Ddb2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the Translate client.
+         * To define a proxy protocol when instantiating the DDB client.
          * 
          * The option will be converted to a
          * <code>software.amazon.awssdk.core.Protocol</code> type.
@@ -203,91 +240,101 @@ public interface Translate2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default Translate2EndpointBuilder proxyProtocol(String proxyProtocol) {
+        default Ddb2EndpointBuilder proxyProtocol(String proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * The region in which Translate client needs to work. When using this
-         * parameter, the configuration will expect the lowercase name of the
-         * region (for example ap-east-1) You'll need to use the name
-         * Region.EU_WEST_1.id().
+         * The provisioned throughput to reserve for reading resources from your
+         * table.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.lang.Long</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder region(String region) {
-            doSetProperty("region", region);
+        default Ddb2EndpointBuilder readCapacity(Long readCapacity) {
+            doSetProperty("readCapacity", readCapacity);
             return this;
         }
         /**
-         * Amazon AWS Secret Key.
+         * The provisioned throughput to reserve for reading resources from your
+         * table.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a <code>java.lang.Long</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder secretKey(String secretKey) {
-            doSetProperty("secretKey", secretKey);
+        default Ddb2EndpointBuilder readCapacity(String readCapacity) {
+            doSetProperty("readCapacity", readCapacity);
             return this;
         }
         /**
-         * Source language to use.
+         * The region in which DDB client needs to work.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder sourceLanguage(String sourceLanguage) {
-            doSetProperty("sourceLanguage", sourceLanguage);
+        default Ddb2EndpointBuilder region(String region) {
+            doSetProperty("region", region);
             return this;
         }
         /**
-         * Target language to use.
+         * The provisioned throughput to reserved for writing resources to your
+         * table.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.lang.Long</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder targetLanguage(String targetLanguage) {
-            doSetProperty("targetLanguage", targetLanguage);
+        default Ddb2EndpointBuilder writeCapacity(Long writeCapacity) {
+            doSetProperty("writeCapacity", writeCapacity);
             return this;
         }
         /**
-         * To use a existing configured AWS Translate as client.
+         * The provisioned throughput to reserved for writing resources to your
+         * table.
          * 
-         * The option is a:
-         * <code>software.amazon.awssdk.services.translate.TranslateClient</code> type.
+         * The option will be converted to a <code>java.lang.Long</code> type.
          * 
          * Group: producer
          */
-        default Translate2EndpointBuilder translateClient(Object translateClient) {
-            doSetProperty("translateClient", translateClient);
+        default Ddb2EndpointBuilder writeCapacity(String writeCapacity) {
+            doSetProperty("writeCapacity", writeCapacity);
             return this;
         }
         /**
-         * To use a existing configured AWS Translate as client.
+         * Amazon AWS Access Key.
          * 
-         * The option will be converted to a
-         * <code>software.amazon.awssdk.services.translate.TranslateClient</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: producer
+         * Group: security
          */
-        default Translate2EndpointBuilder translateClient(String translateClient) {
-            doSetProperty("translateClient", translateClient);
+        default Ddb2EndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
+         * Amazon AWS Secret Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Ddb2EndpointBuilder secretKey(String secretKey) {
+            doSetProperty("secretKey", secretKey);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the AWS 2 Translate component.
+     * Advanced builder for endpoint for the AWS 2 DynamoDB component.
      */
-    public interface AdvancedTranslate2EndpointBuilder
+    public interface AdvancedDdb2EndpointBuilder
             extends
                 EndpointProducerBuilder {
-        default Translate2EndpointBuilder basic() {
-            return (Translate2EndpointBuilder) this;
+        default Ddb2EndpointBuilder basic() {
+            return (Ddb2EndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -298,7 +345,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslate2EndpointBuilder basicPropertyBinding(
+        default AdvancedDdb2EndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -312,7 +359,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslate2EndpointBuilder basicPropertyBinding(
+        default AdvancedDdb2EndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -326,8 +373,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslate2EndpointBuilder synchronous(
-                boolean synchronous) {
+        default AdvancedDdb2EndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -340,7 +386,7 @@ public interface Translate2EndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedTranslate2EndpointBuilder synchronous(String synchronous) {
+        default AdvancedDdb2EndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -348,10 +394,19 @@ public interface Translate2EndpointBuilderFactory {
 
     /**
      * Proxy enum for
-     * <code>org.apache.camel.component.aws2.translate.Translate2Operations</code> enum.
+     * <code>org.apache.camel.component.aws2.ddb.Ddb2Operations</code> enum.
      */
-    enum Translate2Operations {
-        translateText;
+    enum Ddb2Operations {
+        BatchGetItems,
+        DeleteItem,
+        DeleteTable,
+        DescribeTable,
+        GetItem,
+        PutItem,
+        Query,
+        Scan,
+        UpdateItem,
+        UpdateTable;
     }
 
     /**
@@ -362,43 +417,45 @@ public interface Translate2EndpointBuilderFactory {
         https;
     }
 
-    public interface Translate2Builders {
+    public interface Ddb2Builders {
         /**
-         * AWS 2 Translate (camel-aws2-translate)
-         * The aws2-translate component is used for managing Amazon Translate
+         * AWS 2 DynamoDB (camel-aws2-ddb)
+         * The aws2-ddb component is used for storing and retrieving data from
+         * Amazon's DynamoDB service.
          * 
-         * Category: cloud,management
+         * Category: cloud,database,nosql
          * Since: 3.1
-         * Maven coordinates: org.apache.camel:camel-aws2-translate
+         * Maven coordinates: org.apache.camel:camel-aws2-ddb
          * 
-         * Syntax: <code>aws2-translate:label</code>
+         * Syntax: <code>aws2-ddb:tableName</code>
          * 
-         * Path parameter: label (required)
-         * Logical name
+         * Path parameter: tableName (required)
+         * The name of the table currently worked with.
          */
-        default Translate2EndpointBuilder aws2Translate(String path) {
-            return Translate2EndpointBuilderFactory.aws2Translate(path);
+        default Ddb2EndpointBuilder aws2Ddb(String path) {
+            return Ddb2EndpointBuilderFactory.aws2Ddb(path);
         }
     }
     /**
-     * AWS 2 Translate (camel-aws2-translate)
-     * The aws2-translate component is used for managing Amazon Translate
+     * AWS 2 DynamoDB (camel-aws2-ddb)
+     * The aws2-ddb component is used for storing and retrieving data from
+     * Amazon's DynamoDB service.
      * 
-     * Category: cloud,management
+     * Category: cloud,database,nosql
      * Since: 3.1
-     * Maven coordinates: org.apache.camel:camel-aws2-translate
+     * Maven coordinates: org.apache.camel:camel-aws2-ddb
      * 
-     * Syntax: <code>aws2-translate:label</code>
+     * Syntax: <code>aws2-ddb:tableName</code>
      * 
-     * Path parameter: label (required)
-     * Logical name
+     * Path parameter: tableName (required)
+     * The name of the table currently worked with.
      */
-    static Translate2EndpointBuilder aws2Translate(String path) {
-        class Translate2EndpointBuilderImpl extends AbstractEndpointBuilder implements Translate2EndpointBuilder, AdvancedTranslate2EndpointBuilder {
-            public Translate2EndpointBuilderImpl(String path) {
-                super("aws2-translate", path);
+    static Ddb2EndpointBuilder aws2Ddb(String path) {
+        class Ddb2EndpointBuilderImpl extends AbstractEndpointBuilder implements Ddb2EndpointBuilder, AdvancedDdb2EndpointBuilder {
+            public Ddb2EndpointBuilderImpl(String path) {
+                super("aws2-ddb", path);
             }
         }
-        return new Translate2EndpointBuilderImpl(path);
+        return new Ddb2EndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
similarity index 65%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
index 7839287..80ea1e7 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/PgReplicationSlotEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/Ddb2StreamEndpointBuilderFactory.java
@@ -29,44 +29,48 @@ import org.apache.camel.spi.ExceptionHandler;
 import org.apache.camel.spi.PollingConsumerPollStrategy;
 
 /**
- * Consumer endpoint to receive from PostgreSQL Replication Slot.
+ * The aws2-ddbstream component is used for working with Amazon DynamoDB
+ * Streams.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface PgReplicationSlotEndpointBuilderFactory {
+public interface Ddb2StreamEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the PostgresSQL Replication Slot component.
+     * Builder for endpoint for the AWS 2 DynamoDB Streams component.
      */
-    public interface PgReplicationSlotEndpointBuilder
+    public interface Ddb2StreamEndpointBuilder
             extends
                 EndpointConsumerBuilder {
-        default AdvancedPgReplicationSlotEndpointBuilder advanced() {
-            return (AdvancedPgReplicationSlotEndpointBuilder) this;
+        default AdvancedDdb2StreamEndpointBuilder advanced() {
+            return (AdvancedDdb2StreamEndpointBuilder) this;
         }
         /**
-         * PostgreSQL password.
+         * Amazon DynamoDB client to use for all requests for this endpoint.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a:
+         * <code>software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient</code> type.
          * 
-         * Group: common
+         * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder password(String password) {
-            doSetProperty("password", password);
+        default Ddb2StreamEndpointBuilder amazonDynamoDbStreamsClient(
+                Object amazonDynamoDbStreamsClient) {
+            doSetProperty("amazonDynamoDbStreamsClient", amazonDynamoDbStreamsClient);
             return this;
         }
         /**
-         * PostgreSQL username.
+         * Amazon DynamoDB client to use for all requests for this endpoint.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient</code> type.
          * 
-         * Default: postgres
-         * Group: common
+         * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder user(String user) {
-            doSetProperty("user", user);
+        default Ddb2StreamEndpointBuilder amazonDynamoDbStreamsClient(
+                String amazonDynamoDbStreamsClient) {
+            doSetProperty("amazonDynamoDbStreamsClient", amazonDynamoDbStreamsClient);
             return this;
         }
         /**
@@ -83,7 +87,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder bridgeErrorHandler(
+        default Ddb2StreamEndpointBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
@@ -102,12 +106,140 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder bridgeErrorHandler(
+        default Ddb2StreamEndpointBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
         }
         /**
+         * Defines where in the DynaboDB stream to start getting records. Note
+         * that using TRIM_HORIZON can cause a significant delay before the
+         * stream has caught up to real-time. if {AT,AFTER}_SEQUENCE_NUMBER are
+         * used, then a sequenceNumberProvider MUST be supplied.
+         * 
+         * The option is a:
+         * <code>software.amazon.awssdk.services.dynamodb.model.ShardIteratorType</code> type.
+         * 
+         * Default: LATEST
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder iteratorType(
+                ShardIteratorType iteratorType) {
+            doSetProperty("iteratorType", iteratorType);
+            return this;
+        }
+        /**
+         * Defines where in the DynaboDB stream to start getting records. Note
+         * that using TRIM_HORIZON can cause a significant delay before the
+         * stream has caught up to real-time. if {AT,AFTER}_SEQUENCE_NUMBER are
+         * used, then a sequenceNumberProvider MUST be supplied.
+         * 
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.services.dynamodb.model.ShardIteratorType</code> type.
+         * 
+         * Default: LATEST
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder iteratorType(String iteratorType) {
+            doSetProperty("iteratorType", iteratorType);
+            return this;
+        }
+        /**
+         * Maximum number of records that will be fetched in each poll.
+         * 
+         * The option is a: <code>int</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder maxResultsPerRequest(
+                int maxResultsPerRequest) {
+            doSetProperty("maxResultsPerRequest", maxResultsPerRequest);
+            return this;
+        }
+        /**
+         * Maximum number of records that will be fetched in each poll.
+         * 
+         * The option will be converted to a <code>int</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder maxResultsPerRequest(
+                String maxResultsPerRequest) {
+            doSetProperty("maxResultsPerRequest", maxResultsPerRequest);
+            return this;
+        }
+        /**
+         * To define a proxy host when instantiating the DDBStreams client.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyHost(String proxyHost) {
+            doSetProperty("proxyHost", proxyHost);
+            return this;
+        }
+        /**
+         * To define a proxy port when instantiating the DDBStreams client.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyPort(Integer proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * To define a proxy port when instantiating the DDBStreams client.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyPort(String proxyPort) {
+            doSetProperty("proxyPort", proxyPort);
+            return this;
+        }
+        /**
+         * To define a proxy protocol when instantiating the DDBStreams client.
+         * 
+         * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
+         * type.
+         * 
+         * Default: HTTPS
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+            doSetProperty("proxyProtocol", proxyProtocol);
+            return this;
+        }
+        /**
+         * To define a proxy protocol when instantiating the DDBStreams client.
+         * 
+         * The option will be converted to a
+         * <code>software.amazon.awssdk.core.Protocol</code> type.
+         * 
+         * Default: HTTPS
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder proxyProtocol(String proxyProtocol) {
+            doSetProperty("proxyProtocol", proxyProtocol);
+            return this;
+        }
+        /**
+         * The region in which DDBStreams client needs to work.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder region(String region) {
+            doSetProperty("region", region);
+            return this;
+        }
+        /**
          * If the polling consumer did not poll any files, you can enable this
          * option to send an empty message (no body) instead.
          * 
@@ -116,7 +248,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder sendEmptyMessageWhenIdle(
+        default Ddb2StreamEndpointBuilder sendEmptyMessageWhenIdle(
                 boolean sendEmptyMessageWhenIdle) {
             doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
             return this;
@@ -130,12 +262,42 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default PgReplicationSlotEndpointBuilder sendEmptyMessageWhenIdle(
+        default Ddb2StreamEndpointBuilder sendEmptyMessageWhenIdle(
                 String sendEmptyMessageWhenIdle) {
             doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
             return this;
         }
         /**
+         * Provider for the sequence number when using one of the two
+         * ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a
+         * registry reference or a literal sequence number.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder sequenceNumberProvider(
+                Object sequenceNumberProvider) {
+            doSetProperty("sequenceNumberProvider", sequenceNumberProvider);
+            return this;
+        }
+        /**
+         * Provider for the sequence number when using one of the two
+         * ShardIteratorType.{AT,AFTER}_SEQUENCE_NUMBER iterator types. Can be a
+         * registry reference or a literal sequence number.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider</code> type.
+         * 
+         * Group: consumer
+         */
+        default Ddb2StreamEndpointBuilder sequenceNumberProvider(
+                String sequenceNumberProvider) {
+            doSetProperty("sequenceNumberProvider", sequenceNumberProvider);
+            return this;
+        }
+        /**
          * The number of subsequent error polls (failed due some error) that
          * should happen before the backoffMultipler should kick-in.
          * 
@@ -143,7 +305,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffErrorThreshold(
+        default Ddb2StreamEndpointBuilder backoffErrorThreshold(
                 int backoffErrorThreshold) {
             doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
             return this;
@@ -156,7 +318,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffErrorThreshold(
+        default Ddb2StreamEndpointBuilder backoffErrorThreshold(
                 String backoffErrorThreshold) {
             doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
             return this;
@@ -169,7 +331,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffIdleThreshold(
+        default Ddb2StreamEndpointBuilder backoffIdleThreshold(
                 int backoffIdleThreshold) {
             doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
             return this;
@@ -182,7 +344,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffIdleThreshold(
+        default Ddb2StreamEndpointBuilder backoffIdleThreshold(
                 String backoffIdleThreshold) {
             doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
             return this;
@@ -199,7 +361,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffMultiplier(
+        default Ddb2StreamEndpointBuilder backoffMultiplier(
                 int backoffMultiplier) {
             doSetProperty("backoffMultiplier", backoffMultiplier);
             return this;
@@ -216,7 +378,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder backoffMultiplier(
+        default Ddb2StreamEndpointBuilder backoffMultiplier(
                 String backoffMultiplier) {
             doSetProperty("backoffMultiplier", backoffMultiplier);
             return this;
@@ -231,7 +393,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 500
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder delay(long delay) {
+        default Ddb2StreamEndpointBuilder delay(long delay) {
             doSetProperty("delay", delay);
             return this;
         }
@@ -245,7 +407,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 500
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder delay(String delay) {
+        default Ddb2StreamEndpointBuilder delay(String delay) {
             doSetProperty("delay", delay);
             return this;
         }
@@ -258,7 +420,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder greedy(boolean greedy) {
+        default Ddb2StreamEndpointBuilder greedy(boolean greedy) {
             doSetProperty("greedy", greedy);
             return this;
         }
@@ -271,7 +433,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder greedy(String greedy) {
+        default Ddb2StreamEndpointBuilder greedy(String greedy) {
             doSetProperty("greedy", greedy);
             return this;
         }
@@ -285,7 +447,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 1000
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder initialDelay(long initialDelay) {
+        default Ddb2StreamEndpointBuilder initialDelay(long initialDelay) {
             doSetProperty("initialDelay", initialDelay);
             return this;
         }
@@ -299,8 +461,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 1000
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder initialDelay(
-                String initialDelay) {
+        default Ddb2StreamEndpointBuilder initialDelay(String initialDelay) {
             doSetProperty("initialDelay", initialDelay);
             return this;
         }
@@ -314,7 +475,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 0
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder repeatCount(long repeatCount) {
+        default Ddb2StreamEndpointBuilder repeatCount(long repeatCount) {
             doSetProperty("repeatCount", repeatCount);
             return this;
         }
@@ -328,7 +489,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: 0
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder repeatCount(String repeatCount) {
+        default Ddb2StreamEndpointBuilder repeatCount(String repeatCount) {
             doSetProperty("repeatCount", repeatCount);
             return this;
         }
@@ -341,7 +502,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: TRACE
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder runLoggingLevel(
+        default Ddb2StreamEndpointBuilder runLoggingLevel(
                 LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
@@ -356,8 +517,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: TRACE
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder runLoggingLevel(
-                String runLoggingLevel) {
+        default Ddb2StreamEndpointBuilder runLoggingLevel(String runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
         }
@@ -371,7 +531,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder scheduledExecutorService(
+        default Ddb2StreamEndpointBuilder scheduledExecutorService(
                 ScheduledExecutorService scheduledExecutorService) {
             doSetProperty("scheduledExecutorService", scheduledExecutorService);
             return this;
@@ -386,7 +546,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder scheduledExecutorService(
+        default Ddb2StreamEndpointBuilder scheduledExecutorService(
                 String scheduledExecutorService) {
             doSetProperty("scheduledExecutorService", scheduledExecutorService);
             return this;
@@ -400,7 +560,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: none
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder scheduler(String scheduler) {
+        default Ddb2StreamEndpointBuilder scheduler(String scheduler) {
             doSetProperty("scheduler", scheduler);
             return this;
         }
@@ -413,7 +573,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder schedulerProperties(
+        default Ddb2StreamEndpointBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
             doSetProperty("schedulerProperties", schedulerProperties);
             return this;
@@ -428,7 +588,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder schedulerProperties(
+        default Ddb2StreamEndpointBuilder schedulerProperties(
                 String schedulerProperties) {
             doSetProperty("schedulerProperties", schedulerProperties);
             return this;
@@ -441,8 +601,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder startScheduler(
-                boolean startScheduler) {
+        default Ddb2StreamEndpointBuilder startScheduler(boolean startScheduler) {
             doSetProperty("startScheduler", startScheduler);
             return this;
         }
@@ -454,8 +613,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder startScheduler(
-                String startScheduler) {
+        default Ddb2StreamEndpointBuilder startScheduler(String startScheduler) {
             doSetProperty("startScheduler", startScheduler);
             return this;
         }
@@ -467,7 +625,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: MILLISECONDS
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder timeUnit(TimeUnit timeUnit) {
+        default Ddb2StreamEndpointBuilder timeUnit(TimeUnit timeUnit) {
             doSetProperty("timeUnit", timeUnit);
             return this;
         }
@@ -480,7 +638,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: MILLISECONDS
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder timeUnit(String timeUnit) {
+        default Ddb2StreamEndpointBuilder timeUnit(String timeUnit) {
             doSetProperty("timeUnit", timeUnit);
             return this;
         }
@@ -493,8 +651,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder useFixedDelay(
-                boolean useFixedDelay) {
+        default Ddb2StreamEndpointBuilder useFixedDelay(boolean useFixedDelay) {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
@@ -507,22 +664,42 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default PgReplicationSlotEndpointBuilder useFixedDelay(
-                String useFixedDelay) {
+        default Ddb2StreamEndpointBuilder useFixedDelay(String useFixedDelay) {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Ddb2StreamEndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
+         * Amazon AWS Secret Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default Ddb2StreamEndpointBuilder secretKey(String secretKey) {
+            doSetProperty("secretKey", secretKey);
+            return this;
+        }
     }
 
     /**
-     * Advanced builder for endpoint for the PostgresSQL Replication Slot
-     * component.
+     * Advanced builder for endpoint for the AWS 2 DynamoDB Streams component.
      */
-    public interface AdvancedPgReplicationSlotEndpointBuilder
+    public interface AdvancedDdb2StreamEndpointBuilder
             extends
                 EndpointConsumerBuilder {
-        default PgReplicationSlotEndpointBuilder basic() {
-            return (PgReplicationSlotEndpointBuilder) this;
+        default Ddb2StreamEndpointBuilder basic() {
+            return (Ddb2StreamEndpointBuilder) this;
         }
         /**
          * To let the consumer use a custom ExceptionHandler. Notice if the
@@ -535,7 +712,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder exceptionHandler(
+        default AdvancedDdb2StreamEndpointBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -551,7 +728,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder exceptionHandler(
+        default AdvancedDdb2StreamEndpointBuilder exceptionHandler(
                 String exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -563,7 +740,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder exchangePattern(
+        default AdvancedDdb2StreamEndpointBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -576,7 +753,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder exchangePattern(
+        default AdvancedDdb2StreamEndpointBuilder exchangePattern(
                 String exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -592,7 +769,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder pollStrategy(
+        default AdvancedDdb2StreamEndpointBuilder pollStrategy(
                 PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
@@ -608,39 +785,12 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedPgReplicationSlotEndpointBuilder pollStrategy(
+        default AdvancedDdb2StreamEndpointBuilder pollStrategy(
                 String pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
         }
         /**
-         * Auto create slot if it does not exist.
-         * 
-         * The option is a: <code>java.lang.Boolean</code> type.
-         * 
-         * Default: true
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder autoCreateSlot(
-                Boolean autoCreateSlot) {
-            doSetProperty("autoCreateSlot", autoCreateSlot);
-            return this;
-        }
-        /**
-         * Auto create slot if it does not exist.
-         * 
-         * The option will be converted to a <code>java.lang.Boolean</code>
-         * type.
-         * 
-         * Default: true
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder autoCreateSlot(
-                String autoCreateSlot) {
-            doSetProperty("autoCreateSlot", autoCreateSlot);
-            return this;
-        }
-        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -649,7 +799,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedPgReplicationSlotEndpointBuilder basicPropertyBinding(
+        default AdvancedDdb2StreamEndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -663,68 +813,12 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedPgReplicationSlotEndpointBuilder basicPropertyBinding(
+        default AdvancedDdb2StreamEndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
         }
         /**
-         * Slot options to be passed to the output plugin.
-         * 
-         * The option is a: <code>java.util.Map&lt;java.lang.String,
-         * java.lang.Object&gt;</code> type.
-         * 
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder slotOptions(
-                Map<String, Object> slotOptions) {
-            doSetProperty("slotOptions", slotOptions);
-            return this;
-        }
-        /**
-         * Slot options to be passed to the output plugin.
-         * 
-         * The option will be converted to a
-         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
-         * type.
-         * 
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder slotOptions(
-                String slotOptions) {
-            doSetProperty("slotOptions", slotOptions);
-            return this;
-        }
-        /**
-         * Specifies the number of seconds between status packets sent back to
-         * Postgres server.
-         * 
-         * The option is a: <code>java.lang.Integer</code> type.
-         * 
-         * Default: 10
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder statusInterval(
-                Integer statusInterval) {
-            doSetProperty("statusInterval", statusInterval);
-            return this;
-        }
-        /**
-         * Specifies the number of seconds between status packets sent back to
-         * Postgres server.
-         * 
-         * The option will be converted to a <code>java.lang.Integer</code>
-         * type.
-         * 
-         * Default: 10
-         * Group: advanced
-         */
-        default AdvancedPgReplicationSlotEndpointBuilder statusInterval(
-                String statusInterval) {
-            doSetProperty("statusInterval", statusInterval);
-            return this;
-        }
-        /**
          * Sets whether synchronous processing should be strictly used, or Camel
          * is allowed to use asynchronous processing (if supported).
          * 
@@ -733,7 +827,7 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedPgReplicationSlotEndpointBuilder synchronous(
+        default AdvancedDdb2StreamEndpointBuilder synchronous(
                 boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -747,80 +841,71 @@ public interface PgReplicationSlotEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedPgReplicationSlotEndpointBuilder synchronous(
-                String synchronous) {
+        default AdvancedDdb2StreamEndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
-    public interface PgReplicationSlotBuilders {
+    /**
+     * Proxy enum for
+     * <code>software.amazon.awssdk.services.dynamodb.model.ShardIteratorType</code> enum.
+     */
+    enum ShardIteratorType {
+        TRIM_HORIZON,
+        LATEST,
+        AT_SEQUENCE_NUMBER,
+        AFTER_SEQUENCE_NUMBER,
+        null;
+    }
+
+    /**
+     * Proxy enum for <code>software.amazon.awssdk.core.Protocol</code> enum.
+     */
+    enum Protocol {
+        http,
+        https;
+    }
+
+    public interface Ddb2StreamBuilders {
         /**
-         * PostgresSQL Replication Slot (camel-pg-replication-slot)
-         * Consumer endpoint to receive from PostgreSQL Replication Slot.
-         * 
-         * Category: database,sql
-         * Since: 3.0
-         * Maven coordinates: org.apache.camel:camel-pg-replication-slot
-         * 
-         * Syntax:
-         * <code>pg-replication-slot:host:port/database/slot:outputPlugin</code>
-         * 
-         * Path parameter: slot (required)
-         * Replication Slot name
+         * AWS 2 DynamoDB Streams (camel-aws2-ddb)
+         * The aws2-ddbstream component is used for working with Amazon DynamoDB
+         * Streams.
          * 
-         * Path parameter: host
-         * PostgreSQL server host
-         * Default value: localhost
+         * Category: cloud,messaging,streams
+         * Since: 3.1
+         * Maven coordinates: org.apache.camel:camel-aws2-ddb
          * 
-         * Path parameter: port
-         * PostgreSQL server port
-         * Default value: 5432
+         * Syntax: <code>aws2-ddbstream:tableName</code>
          * 
-         * Path parameter: database (required)
-         * PostgreSQL database name
-         * 
-         * Path parameter: outputPlugin (required)
-         * Output plugin name
+         * Path parameter: tableName (required)
+         * Name of the dynamodb table
          */
-        default PgReplicationSlotEndpointBuilder pgReplicationSlot(String path) {
-            return PgReplicationSlotEndpointBuilderFactory.pgReplicationSlot(path);
+        default Ddb2StreamEndpointBuilder aws2Ddbstream(String path) {
+            return Ddb2StreamEndpointBuilderFactory.aws2Ddbstream(path);
         }
     }
     /**
-     * PostgresSQL Replication Slot (camel-pg-replication-slot)
-     * Consumer endpoint to receive from PostgreSQL Replication Slot.
-     * 
-     * Category: database,sql
-     * Since: 3.0
-     * Maven coordinates: org.apache.camel:camel-pg-replication-slot
-     * 
-     * Syntax:
-     * <code>pg-replication-slot:host:port/database/slot:outputPlugin</code>
-     * 
-     * Path parameter: slot (required)
-     * Replication Slot name
-     * 
-     * Path parameter: host
-     * PostgreSQL server host
-     * Default value: localhost
+     * AWS 2 DynamoDB Streams (camel-aws2-ddb)
+     * The aws2-ddbstream component is used for working with Amazon DynamoDB
+     * Streams.
      * 
-     * Path parameter: port
-     * PostgreSQL server port
-     * Default value: 5432
+     * Category: cloud,messaging,streams
+     * Since: 3.1
+     * Maven coordinates: org.apache.camel:camel-aws2-ddb
      * 
-     * Path parameter: database (required)
-     * PostgreSQL database name
+     * Syntax: <code>aws2-ddbstream:tableName</code>
      * 
-     * Path parameter: outputPlugin (required)
-     * Output plugin name
+     * Path parameter: tableName (required)
+     * Name of the dynamodb table
      */
-    static PgReplicationSlotEndpointBuilder pgReplicationSlot(String path) {
-        class PgReplicationSlotEndpointBuilderImpl extends AbstractEndpointBuilder implements PgReplicationSlotEndpointBuilder, AdvancedPgReplicationSlotEndpointBuilder {
-            public PgReplicationSlotEndpointBuilderImpl(String path) {
-                super("pg-replication-slot", path);
+    static Ddb2StreamEndpointBuilder aws2Ddbstream(String path) {
+        class Ddb2StreamEndpointBuilderImpl extends AbstractEndpointBuilder implements Ddb2StreamEndpointBuilder, AdvancedDdb2StreamEndpointBuilder {
+            public Ddb2StreamEndpointBuilderImpl(String path) {
+                super("aws2-ddbstream", path);
             }
         }
-        return new PgReplicationSlotEndpointBuilderImpl(path);
+        return new Ddb2StreamEndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
index 3ee7170..bc6dc08 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectEndpointBuilderFactory.java
@@ -25,8 +25,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The direct component provides direct, synchronous call to another endpoint
- * from the same CamelContext. This endpoint can be used to connect existing
- * routes in the same CamelContext.
+ * from the same CamelContext.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -489,8 +488,7 @@ public interface DirectEndpointBuilderFactory {
         /**
          * Direct (camel-direct)
          * The direct component provides direct, synchronous call to another
-         * endpoint from the same CamelContext. This endpoint can be used to
-         * connect existing routes in the same CamelContext.
+         * endpoint from the same CamelContext.
          * 
          * Category: core,endpoint
          * Since: 1.0
@@ -508,8 +506,7 @@ public interface DirectEndpointBuilderFactory {
     /**
      * Direct (camel-direct)
      * The direct component provides direct, synchronous call to another
-     * endpoint from the same CamelContext. This endpoint can be used to connect
-     * existing routes in the same CamelContext.
+     * endpoint from the same CamelContext.
      * 
      * Category: core,endpoint
      * Since: 1.0
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
index cf30473..29a941f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DirectVmEndpointBuilderFactory.java
@@ -26,8 +26,7 @@ import org.apache.camel.spi.HeaderFilterStrategy;
 
 /**
  * The direct-vm component provides direct, synchronous call to another endpoint
- * from any CamelContext in the same JVM. This endpoint can be used to connect
- * existing routes in the same JVM between different CamelContexts.
+ * from any CamelContext in the same JVM.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -604,9 +603,7 @@ public interface DirectVmEndpointBuilderFactory {
         /**
          * Direct VM (camel-directvm)
          * The direct-vm component provides direct, synchronous call to another
-         * endpoint from any CamelContext in the same JVM. This endpoint can be
-         * used to connect existing routes in the same JVM between different
-         * CamelContexts.
+         * endpoint from any CamelContext in the same JVM.
          * 
          * Category: core,endpoint
          * Since: 2.10
@@ -624,9 +621,7 @@ public interface DirectVmEndpointBuilderFactory {
     /**
      * Direct VM (camel-directvm)
      * The direct-vm component provides direct, synchronous call to another
-     * endpoint from any CamelContext in the same JVM. This endpoint can be used
-     * to connect existing routes in the same JVM between different
-     * CamelContexts.
+     * endpoint from any CamelContext in the same JVM.
      * 
      * Category: core,endpoint
      * Since: 2.10
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
index d631f83..86cf1d2 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorEndpointBuilderFactory.java
@@ -26,9 +26,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The disruptor component provides asynchronous SEDA behavior using LMAX
- * Disruptor. This component works much as the standard SEDA Component, but
- * utilizes a Disruptor instead of a BlockingQueue utilized by the standard
- * SEDA.
+ * Disruptor.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -759,9 +757,7 @@ public interface DisruptorEndpointBuilderFactory {
         /**
          * Disruptor (camel-disruptor)
          * The disruptor component provides asynchronous SEDA behavior using
-         * LMAX Disruptor. This component works much as the standard SEDA
-         * Component, but utilizes a Disruptor instead of a BlockingQueue
-         * utilized by the standard SEDA.
+         * LMAX Disruptor.
          * 
          * Category: endpoint
          * Since: 2.12
@@ -779,9 +775,7 @@ public interface DisruptorEndpointBuilderFactory {
     /**
      * Disruptor (camel-disruptor)
      * The disruptor component provides asynchronous SEDA behavior using LMAX
-     * Disruptor. This component works much as the standard SEDA Component, but
-     * utilizes a Disruptor instead of a BlockingQueue utilized by the standard
-     * SEDA.
+     * Disruptor.
      * 
      * Category: endpoint
      * Since: 2.12
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
index e39a773..5017dcf 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DisruptorVmEndpointBuilderFactory.java
@@ -26,9 +26,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The disruptor component provides asynchronous SEDA behavior using LMAX
- * Disruptor. This component works much as the standard SEDA Component, but
- * utilizes a Disruptor instead of a BlockingQueue utilized by the standard
- * SEDA.
+ * Disruptor.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -761,9 +759,7 @@ public interface DisruptorVmEndpointBuilderFactory {
         /**
          * Disruptor VM (camel-disruptor)
          * The disruptor component provides asynchronous SEDA behavior using
-         * LMAX Disruptor. This component works much as the standard SEDA
-         * Component, but utilizes a Disruptor instead of a BlockingQueue
-         * utilized by the standard SEDA.
+         * LMAX Disruptor.
          * 
          * Category: endpoint
          * Since: 2.12
@@ -781,9 +777,7 @@ public interface DisruptorVmEndpointBuilderFactory {
     /**
      * Disruptor VM (camel-disruptor)
      * The disruptor component provides asynchronous SEDA behavior using LMAX
-     * Disruptor. This component works much as the standard SEDA Component, but
-     * utilizes a Disruptor instead of a BlockingQueue utilized by the standard
-     * SEDA.
+     * Disruptor.
      * 
      * Category: endpoint
      * Since: 2.12
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
index 5987a64..e0baeab 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DockerEndpointBuilderFactory.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.builder.endpoint.dsl;
 
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.ExchangePattern;
 import org.apache.camel.builder.EndpointConsumerBuilder;
@@ -451,6 +452,33 @@ public interface DockerEndpointBuilderFactory {
             return this;
         }
         /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointConsumerBuilder parameters(
+                Map<String, Object> parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointConsumerBuilder parameters(
+                String parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
          * Server address for docker registry.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -883,6 +911,33 @@ public interface DockerEndpointBuilderFactory {
             return this;
         }
         /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointProducerBuilder parameters(
+                Map<String, Object> parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointProducerBuilder parameters(
+                String parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
          * Server address for docker registry.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -1272,6 +1327,32 @@ public interface DockerEndpointBuilderFactory {
             return this;
         }
         /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option is a: <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointBuilder parameters(
+                Map<String, Object> parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
+         * Additional configuration parameters as key/value pairs.
+         * 
+         * The option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedDockerEndpointBuilder parameters(String parameters) {
+            doSetProperty("parameters", parameters);
+            return this;
+        }
+        /**
          * Server address for docker registry.
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
index 66349c6..0087458 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DrillEndpointBuilderFactory.java
@@ -51,7 +51,7 @@ public interface DrillEndpointBuilderFactory {
             return this;
         }
         /**
-         * Drill directory in ZooKeeper.
+         * Drill directory.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -132,7 +132,7 @@ public interface DrillEndpointBuilderFactory {
             return this;
         }
         /**
-         * ZooKeeper port number.
+         * Port number.
          * 
          * The option is a: <code>java.lang.Integer</code> type.
          * 
@@ -144,7 +144,7 @@ public interface DrillEndpointBuilderFactory {
             return this;
         }
         /**
-         * ZooKeeper port number.
+         * Port number.
          * 
          * The option will be converted to a <code>java.lang.Integer</code>
          * type.
@@ -245,8 +245,7 @@ public interface DrillEndpointBuilderFactory {
          * Syntax: <code>drill:host</code>
          * 
          * Path parameter: host (required)
-         * ZooKeeper host name or IP address. Use local instead of a host name
-         * or IP address to connect to the local Drillbit
+         * Host name or IP address
          */
         default DrillEndpointBuilder drill(String path) {
             return DrillEndpointBuilderFactory.drill(path);
@@ -264,8 +263,7 @@ public interface DrillEndpointBuilderFactory {
      * Syntax: <code>drill:host</code>
      * 
      * Path parameter: host (required)
-     * ZooKeeper host name or IP address. Use local instead of a host name or IP
-     * address to connect to the local Drillbit
+     * Host name or IP address
      */
     static DrillEndpointBuilder drill(String path) {
         class DrillEndpointBuilderImpl extends AbstractEndpointBuilder implements DrillEndpointBuilder, AdvancedDrillEndpointBuilder {
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
index 4ffd4f3..d6fde27 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EC2EndpointBuilderFactory.java
@@ -204,10 +204,10 @@ public interface EC2EndpointBuilderFactory {
             return this;
         }
         /**
-         * The region in which EC2 client needs to work. When using this
-         * parameter, the configuration will expect the capitalized name of the
-         * region (for example AP_EAST_1) You'll need to use the name
-         * Regions.EU_WEST_1.name().
+         * The region in which ECS client needs to work. When using this
+         * parameter, the configuration will expect the lowercase name of the
+         * region (for example ap-east-1) You'll need to use the name
+         * Region.EU_WEST_1.id().
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
index 6533ce9..075357c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ECS2EndpointBuilderFactory.java
@@ -38,17 +38,6 @@ public interface ECS2EndpointBuilderFactory {
             return (AdvancedECS2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: producer
-         */
-        default ECS2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
          * To use a existing configured AWS ECS as client.
          * 
          * The option is a:
@@ -213,11 +202,22 @@ public interface ECS2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default ECS2EndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
          * Amazon AWS Secret Key.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: producer
+         * Group: security
          */
         default ECS2EndpointBuilder secretKey(String secretKey) {
             doSetProperty("secretKey", secretKey);
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
index e3b210d..dd07412 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
@@ -22,7 +22,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws-eks is used for managing Amazon EKS
+ * The aws2-eks is used for managing Amazon EKS
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -38,17 +38,6 @@ public interface EKS2EndpointBuilderFactory {
             return (AdvancedEKS2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: producer
-         */
-        default EKS2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
          * To use a existing configured AWS EKS as client.
          * 
          * The option is a:
@@ -213,11 +202,22 @@ public interface EKS2EndpointBuilderFactory {
             return this;
         }
         /**
+         * Amazon AWS Access Key.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default EKS2EndpointBuilder accessKey(String accessKey) {
+            doSetProperty("accessKey", accessKey);
+            return this;
+        }
+        /**
          * Amazon AWS Secret Key.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: producer
+         * Group: security
          */
         default EKS2EndpointBuilder secretKey(String secretKey) {
             doSetProperty("secretKey", secretKey);
@@ -312,7 +312,7 @@ public interface EKS2EndpointBuilderFactory {
     public interface EKS2Builders {
         /**
          * AWS 2 EKS (camel-aws2-eks)
-         * The aws-eks is used for managing Amazon EKS
+         * The aws2-eks is used for managing Amazon EKS
          * 
          * Category: cloud,management
          * Since: 3.1
@@ -329,7 +329,7 @@ public interface EKS2EndpointBuilderFactory {
     }
     /**
      * AWS 2 EKS (camel-aws2-eks)
-     * The aws-eks is used for managing Amazon EKS
+     * The aws2-eks is used for managing Amazon EKS
      * 
      * Category: cloud,management
      * Since: 3.1
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
index 1e29048..21e142f 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElasticsearchEndpointBuilderFactory.java
@@ -141,6 +141,29 @@ public interface ElasticsearchEndpointBuilderFactory {
             return this;
         }
         /**
+         * Starting index of the response.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: producer
+         */
+        default ElasticsearchEndpointBuilder from(Integer from) {
+            doSetProperty("from", from);
+            return this;
+        }
+        /**
+         * Starting index of the response.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: producer
+         */
+        default ElasticsearchEndpointBuilder from(String from) {
+            doSetProperty("from", from);
+            return this;
+        }
+        /**
          * Comma separated list with ip:port formatted remote transport
          * addresses to use.
          * 
@@ -283,6 +306,29 @@ public interface ElasticsearchEndpointBuilderFactory {
             return this;
         }
         /**
+         * Size of the response.
+         * 
+         * The option is a: <code>java.lang.Integer</code> type.
+         * 
+         * Group: producer
+         */
+        default ElasticsearchEndpointBuilder size(Integer size) {
+            doSetProperty("size", size);
+            return this;
+        }
+        /**
+         * Size of the response.
+         * 
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
+         * 
+         * Group: producer
+         */
+        default ElasticsearchEndpointBuilder size(String size) {
+            doSetProperty("size", size);
+            return this;
+        }
+        /**
          * The delay of a sniff execution scheduled after a failure (in
          * milliseconds).
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
index 675ad5e..bc96774 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ElytronEndpointBuilderFactory.java
@@ -57,12 +57,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option is a: <code>boolean</code> type.
@@ -75,12 +75,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option will be converted to a <code>boolean</code> type.
@@ -255,9 +255,9 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * if true , the consumer will post notifications to the route when a
-         * new WebSocket peer connects, disconnects, etc. See
-         * UndertowConstants.EVENT_TYPE and EventType .
+         * if true, the consumer will post notifications to the route when a new
+         * WebSocket peer connects, disconnects, etc. See
+         * UndertowConstants.EVENT_TYPE and EventType.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -270,9 +270,9 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * if true , the consumer will post notifications to the route when a
-         * new WebSocket peer connects, disconnects, etc. See
-         * UndertowConstants.EVENT_TYPE and EventType .
+         * if true, the consumer will post notifications to the route when a new
+         * WebSocket peer connects, disconnects, etc. See
+         * UndertowConstants.EVENT_TYPE and EventType.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -379,12 +379,13 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies a comma-delimited set of Undertow HttpHandler instances to
-         * lookup in your Registry. These handlers are added to the Undertow
-         * handler chain (for example, to add security). Important: You can not
-         * use different handlers with different Undertow endpoints using the
-         * same port number. The handlers is associated to the port number. If
-         * you need different handlers, then use different port numbers.
+         * Specifies a comma-delimited set of io.undertow.server.HttpHandler
+         * instances to lookup in your Registry. These handlers are added to the
+         * Undertow handler chain (for example, to add security). Important: You
+         * can not use different handlers with different Undertow endpoints
+         * using the same port number. The handlers is associated to the port
+         * number. If you need different handlers, then use different port
+         * numbers.
          * 
          * The option is a:
          * <code>java.util.Set&lt;org.apache.camel.component.undertow.HttpHandlerRegistrationInfo&gt;</code> type.
@@ -397,12 +398,13 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * Specifies a comma-delimited set of Undertow HttpHandler instances to
-         * lookup in your Registry. These handlers are added to the Undertow
-         * handler chain (for example, to add security). Important: You can not
-         * use different handlers with different Undertow endpoints using the
-         * same port number. The handlers is associated to the port number. If
-         * you need different handlers, then use different port numbers.
+         * Specifies a comma-delimited set of io.undertow.server.HttpHandler
+         * instances to lookup in your Registry. These handlers are added to the
+         * Undertow handler chain (for example, to add security). Important: You
+         * can not use different handlers with different Undertow endpoints
+         * using the same port number. The handlers is associated to the port
+         * number. If you need different handlers, then use different port
+         * numbers.
          * 
          * The option will be converted to a
          * <code>java.util.Set&lt;org.apache.camel.component.undertow.HttpHandlerRegistrationInfo&gt;</code> type.
@@ -580,12 +582,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option is a: <code>boolean</code> type.
@@ -598,12 +600,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option will be converted to a <code>boolean</code> type.
@@ -710,7 +712,7 @@ public interface ElytronEndpointBuilderFactory {
         }
         /**
          * Sets additional channel options. The options that can be used are
-         * defined in org.xnio.Options . To configure from endpoint uri, then
+         * defined in org.xnio.Options. To configure from endpoint uri, then
          * prefix each option with option., such as
          * option.close-abort=true&option.send-buffer=8192.
          * 
@@ -726,7 +728,7 @@ public interface ElytronEndpointBuilderFactory {
         }
         /**
          * Sets additional channel options. The options that can be used are
-         * defined in org.xnio.Options . To configure from endpoint uri, then
+         * defined in org.xnio.Options. To configure from endpoint uri, then
          * prefix each option with option., such as
          * option.close-abort=true&option.send-buffer=8192.
          * 
@@ -1159,12 +1161,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option is a: <code>boolean</code> type.
@@ -1177,12 +1179,12 @@ public interface ElytronEndpointBuilderFactory {
             return this;
         }
         /**
-         * For HTTP endpoint: if true , text and binary messages will be wrapped
-         * as java.io.InputStream before they are passed to an Exchange ;
+         * For HTTP endpoint: if true, text and binary messages will be wrapped
+         * as java.io.InputStream before they are passed to an Exchange;
          * otherwise they will be passed as byte. For WebSocket endpoint: if
-         * true , text and binary messages will be wrapped as java.io.Reader and
+         * true, text and binary messages will be wrapped as java.io.Reader and
          * java.io.InputStream respectively before they are passed to an
-         * Exchange ; otherwise they will be passed as String and byte
+         * Exchange; otherwise they will be passed as String and byte
          * respectively.
          * 
          * The option will be converted to a <code>boolean</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WekaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdKeysEndpointBuilderFactory.java
similarity index 54%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WekaEndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdKeysEndpointBuilderFactory.java
index 98518bb..9074bd1 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/WekaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdKeysEndpointBuilderFactory.java
@@ -22,209 +22,214 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The camel-weka component provides Data Mining functionality through Weka.
+ * Camel Etcd support
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface WekaEndpointBuilderFactory {
+public interface EtcdKeysEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the Weka component.
+     * Builder for endpoint for the Etcd Keys component.
      */
-    public interface WekaEndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedWekaEndpointBuilder advanced() {
-            return (AdvancedWekaEndpointBuilder) this;
+    public interface EtcdKeysEndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedEtcdKeysEndpointBuilder advanced() {
+            return (AdvancedEtcdKeysEndpointBuilder) this;
         }
         /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
+         * To apply an action recursively.
          * 
          * The option is a: <code>boolean</code> type.
          * 
          * Default: false
          * Group: producer
          */
-        default WekaEndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
+        default EtcdKeysEndpointBuilder recursive(boolean recursive) {
+            doSetProperty("recursive", recursive);
             return this;
         }
         /**
-         * Whether the producer should be started lazy (on the first message).
-         * By starting lazy you can use this to allow CamelContext and routes to
-         * startup in situations where a producer may otherwise fail during
-         * starting and cause the route to fail being started. By deferring this
-         * startup to be lazy then the startup failure can be handled during
-         * routing messages via Camel's routing error handlers. Beware that when
-         * the first message is processed then creating and starting the
-         * producer may take a little time and prolong the total processing time
-         * of the processing.
+         * To apply an action recursively.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
          * Default: false
          * Group: producer
          */
-        default WekaEndpointBuilder lazyStartProducer(String lazyStartProducer) {
-            doSetProperty("lazyStartProducer", lazyStartProducer);
+        default EtcdKeysEndpointBuilder recursive(String recursive) {
+            doSetProperty("recursive", recursive);
             return this;
         }
         /**
-         * The filter spec (i.e. Name Options).
+         * The path to look for for service discovery.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: filter
+         * Default: /services/
+         * Group: producer
          */
-        default WekaEndpointBuilder apply(String apply) {
-            doSetProperty("apply", apply);
+        default EtcdKeysEndpointBuilder servicePath(String servicePath) {
+            doSetProperty("servicePath", servicePath);
             return this;
         }
         /**
-         * The classifier spec (i.e. Name Options).
+         * To set the maximum time an action could take to complete.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.lang.Long</code> type.
          * 
-         * Group: model
+         * Group: producer
          */
-        default WekaEndpointBuilder build(String build) {
-            doSetProperty("build", build);
+        default EtcdKeysEndpointBuilder timeout(Long timeout) {
+            doSetProperty("timeout", timeout);
             return this;
         }
         /**
-         * The named dataset to train the classifier with.
+         * To set the maximum time an action could take to complete.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a <code>java.lang.Long</code> type.
          * 
-         * Group: model
+         * Group: producer
          */
-        default WekaEndpointBuilder dsname(String dsname) {
-            doSetProperty("dsname", dsname);
+        default EtcdKeysEndpointBuilder timeout(String timeout) {
+            doSetProperty("timeout", timeout);
             return this;
         }
         /**
-         * Numer of folds to use for cross-validation.
+         * To set the URIs the client connects.
          * 
-         * The option is a: <code>int</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: 10
-         * Group: model
+         * Default: http://localhost:2379,http://localhost:4001
+         * Group: common
          */
-        default WekaEndpointBuilder folds(int folds) {
-            doSetProperty("folds", folds);
+        default EtcdKeysEndpointBuilder uris(String uris) {
+            doSetProperty("uris", uris);
             return this;
         }
         /**
-         * Numer of folds to use for cross-validation.
+         * Whether the producer should be started lazy (on the first message).
+         * By starting lazy you can use this to allow CamelContext and routes to
+         * startup in situations where a producer may otherwise fail during
+         * starting and cause the route to fail being started. By deferring this
+         * startup to be lazy then the startup failure can be handled during
+         * routing messages via Camel's routing error handlers. Beware that when
+         * the first message is processed then creating and starting the
+         * producer may take a little time and prolong the total processing time
+         * of the processing.
          * 
-         * The option will be converted to a <code>int</code> type.
+         * The option is a: <code>boolean</code> type.
          * 
-         * Default: 10
-         * Group: model
+         * Default: false
+         * Group: producer
          */
-        default WekaEndpointBuilder folds(String folds) {
-            doSetProperty("folds", folds);
+        default EtcdKeysEndpointBuilder lazyStartProducer(
+                boolean lazyStartProducer) {
+            doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
         /**
-         * Path to load the model from.
+         * Whether the producer should be started lazy (on the first message).
+         * By starting lazy you can use this to allow CamelContext and routes to
+         * startup in situations where a producer may otherwise fail during
+         * starting and cause the route to fail being started. By deferring this
+         * startup to be lazy then the startup failure can be handled during
+         * routing messages via Camel's routing error handlers. Beware that when
+         * the first message is processed then creating and starting the
+         * producer may take a little time and prolong the total processing time
+         * of the processing.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option will be converted to a <code>boolean</code> type.
          * 
-         * Group: model
+         * Default: false
+         * Group: producer
          */
-        default WekaEndpointBuilder loadFrom(String loadFrom) {
-            doSetProperty("loadFrom", loadFrom);
+        default EtcdKeysEndpointBuilder lazyStartProducer(
+                String lazyStartProducer) {
+            doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
         /**
-         * Path to save the model to.
+         * To set the lifespan of a key in milliseconds.
          * 
-         * The option is a: <code>java.lang.String</code> type.
+         * The option is a: <code>java.lang.Integer</code> type.
          * 
-         * Group: model
+         * Group: producer
          */
-        default WekaEndpointBuilder saveTo(String saveTo) {
-            doSetProperty("saveTo", saveTo);
+        default EtcdKeysEndpointBuilder timeToLive(Integer timeToLive) {
+            doSetProperty("timeToLive", timeToLive);
             return this;
         }
         /**
-         * An optional seed for the randomizer.
+         * To set the lifespan of a key in milliseconds.
          * 
-         * The option is a: <code>int</code> type.
+         * The option will be converted to a <code>java.lang.Integer</code>
+         * type.
          * 
-         * Default: 1
-         * Group: model
+         * Group: producer
          */
-        default WekaEndpointBuilder seed(int seed) {
-            doSetProperty("seed", seed);
+        default EtcdKeysEndpointBuilder timeToLive(String timeToLive) {
+            doSetProperty("timeToLive", timeToLive);
             return this;
         }
         /**
-         * An optional seed for the randomizer.
+         * The password to use for basic authentication.
          * 
-         * The option will be converted to a <code>int</code> type.
+         * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: 1
-         * Group: model
+         * Group: security
          */
-        default WekaEndpointBuilder seed(String seed) {
-            doSetProperty("seed", seed);
+        default EtcdKeysEndpointBuilder password(String password) {
+            doSetProperty("password", password);
             return this;
         }
         /**
-         * Flag on whether to use cross-validation with the current dataset.
+         * To configure security using SSLContextParameters.
          * 
-         * The option is a: <code>boolean</code> type.
+         * The option is a:
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
          * 
-         * Default: false
-         * Group: model
+         * Group: security
          */
-        default WekaEndpointBuilder xval(boolean xval) {
-            doSetProperty("xval", xval);
+        default EtcdKeysEndpointBuilder sslContextParameters(
+                Object sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
         /**
-         * Flag on whether to use cross-validation with the current dataset.
+         * To configure security using SSLContextParameters.
          * 
-         * The option will be converted to a <code>boolean</code> type.
+         * The option will be converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
          * 
-         * Default: false
-         * Group: model
+         * Group: security
          */
-        default WekaEndpointBuilder xval(String xval) {
-            doSetProperty("xval", xval);
+        default EtcdKeysEndpointBuilder sslContextParameters(
+                String sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
             return this;
         }
         /**
-         * An in/out path for the read/write commands.
+         * The user name to use for basic authentication.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: write
+         * Group: security
          */
-        default WekaEndpointBuilder path(String path) {
-            doSetProperty("path", path);
+        default EtcdKeysEndpointBuilder userName(String userName) {
+            doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the Weka component.
+     * Advanced builder for endpoint for the Etcd Keys component.
      */
-    public interface AdvancedWekaEndpointBuilder
+    public interface AdvancedEtcdKeysEndpointBuilder
             extends
                 EndpointProducerBuilder {
-        default WekaEndpointBuilder basic() {
-            return (WekaEndpointBuilder) this;
+        default EtcdKeysEndpointBuilder basic() {
+            return (EtcdKeysEndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -235,7 +240,7 @@ public interface WekaEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedWekaEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdKeysEndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -249,7 +254,7 @@ public interface WekaEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedWekaEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdKeysEndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -263,7 +268,7 @@ public interface WekaEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedWekaEndpointBuilder synchronous(boolean synchronous) {
+        default AdvancedEtcdKeysEndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -276,53 +281,49 @@ public interface WekaEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedWekaEndpointBuilder synchronous(String synchronous) {
+        default AdvancedEtcdKeysEndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
-    public interface WekaBuilders {
+    public interface EtcdKeysBuilders {
         /**
-         * Weka (camel-weka)
-         * The camel-weka component provides Data Mining functionality through
-         * Weka.
+         * Etcd Keys (camel-etcd)
+         * Camel Etcd support
          * 
-         * Category: Datamining
-         * Since: 3.1
-         * Maven coordinates: org.apache.camel:camel-weka
+         * Category: clustering,database
+         * Since: 2.18
+         * Maven coordinates: org.apache.camel:camel-etcd
          * 
-         * Syntax: <code>weka:command</code>
+         * Syntax: <code>etcd-keys:path</code>
          * 
-         * Path parameter: command (required)
-         * The command to use.
-         * The value can be one of: filter, model, read, write, push, pop,
-         * version
+         * Path parameter: path
+         * The path the endpoint refers to
          */
-        default WekaEndpointBuilder weka(String path) {
-            return WekaEndpointBuilderFactory.weka(path);
+        default EtcdKeysEndpointBuilder etcdKeys(String path) {
+            return EtcdKeysEndpointBuilderFactory.etcdKeys(path);
         }
     }
     /**
-     * Weka (camel-weka)
-     * The camel-weka component provides Data Mining functionality through Weka.
+     * Etcd Keys (camel-etcd)
+     * Camel Etcd support
      * 
-     * Category: Datamining
-     * Since: 3.1
-     * Maven coordinates: org.apache.camel:camel-weka
+     * Category: clustering,database
+     * Since: 2.18
+     * Maven coordinates: org.apache.camel:camel-etcd
      * 
-     * Syntax: <code>weka:command</code>
+     * Syntax: <code>etcd-keys:path</code>
      * 
-     * Path parameter: command (required)
-     * The command to use.
-     * The value can be one of: filter, model, read, write, push, pop, version
+     * Path parameter: path
+     * The path the endpoint refers to
      */
-    static WekaEndpointBuilder weka(String path) {
-        class WekaEndpointBuilderImpl extends AbstractEndpointBuilder implements WekaEndpointBuilder, AdvancedWekaEndpointBuilder {
-            public WekaEndpointBuilderImpl(String path) {
-                super("weka", path);
+    static EtcdKeysEndpointBuilder etcdKeys(String path) {
+        class EtcdKeysEndpointBuilderImpl extends AbstractEndpointBuilder implements EtcdKeysEndpointBuilder, AdvancedEtcdKeysEndpointBuilder {
+            public EtcdKeysEndpointBuilderImpl(String path) {
+                super("etcd-keys", path);
             }
         }
-        return new WekaEndpointBuilderImpl(path);
+        return new EtcdKeysEndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdStatsEndpointBuilderFactory.java
similarity index 81%
rename from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
rename to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdStatsEndpointBuilderFactory.java
index 1b5b115..2333bea 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdStatsEndpointBuilderFactory.java
@@ -35,17 +35,17 @@ import org.apache.camel.spi.PollingConsumerPollStrategy;
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface EtcdEndpointBuilderFactory {
+public interface EtcdStatsEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint consumers for the Etcd component.
+     * Builder for endpoint consumers for the Etcd Stats component.
      */
-    public interface EtcdEndpointConsumerBuilder
+    public interface EtcdStatsEndpointConsumerBuilder
             extends
                 EndpointConsumerBuilder {
-        default AdvancedEtcdEndpointConsumerBuilder advanced() {
-            return (AdvancedEtcdEndpointConsumerBuilder) this;
+        default AdvancedEtcdStatsEndpointConsumerBuilder advanced() {
+            return (AdvancedEtcdStatsEndpointConsumerBuilder) this;
         }
         /**
          * To apply an action recursively.
@@ -55,7 +55,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder recursive(boolean recursive) {
+        default EtcdStatsEndpointConsumerBuilder recursive(boolean recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -67,7 +67,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder recursive(String recursive) {
+        default EtcdStatsEndpointConsumerBuilder recursive(String recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -79,7 +79,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: /services/
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder servicePath(String servicePath) {
+        default EtcdStatsEndpointConsumerBuilder servicePath(String servicePath) {
             doSetProperty("servicePath", servicePath);
             return this;
         }
@@ -90,7 +90,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder timeout(Long timeout) {
+        default EtcdStatsEndpointConsumerBuilder timeout(Long timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -101,7 +101,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder timeout(String timeout) {
+        default EtcdStatsEndpointConsumerBuilder timeout(String timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -113,7 +113,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: http://localhost:2379,http://localhost:4001
          * Group: common
          */
-        default EtcdEndpointConsumerBuilder uris(String uris) {
+        default EtcdStatsEndpointConsumerBuilder uris(String uris) {
             doSetProperty("uris", uris);
             return this;
         }
@@ -131,7 +131,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder bridgeErrorHandler(
+        default EtcdStatsEndpointConsumerBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
@@ -150,7 +150,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder bridgeErrorHandler(
+        default EtcdStatsEndpointConsumerBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
@@ -163,7 +163,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder sendEmptyExchangeOnTimeout(
+        default EtcdStatsEndpointConsumerBuilder sendEmptyExchangeOnTimeout(
                 boolean sendEmptyExchangeOnTimeout) {
             doSetProperty("sendEmptyExchangeOnTimeout", sendEmptyExchangeOnTimeout);
             return this;
@@ -176,7 +176,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder sendEmptyExchangeOnTimeout(
+        default EtcdStatsEndpointConsumerBuilder sendEmptyExchangeOnTimeout(
                 String sendEmptyExchangeOnTimeout) {
             doSetProperty("sendEmptyExchangeOnTimeout", sendEmptyExchangeOnTimeout);
             return this;
@@ -190,7 +190,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder sendEmptyMessageWhenIdle(
+        default EtcdStatsEndpointConsumerBuilder sendEmptyMessageWhenIdle(
                 boolean sendEmptyMessageWhenIdle) {
             doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
             return this;
@@ -204,7 +204,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default EtcdEndpointConsumerBuilder sendEmptyMessageWhenIdle(
+        default EtcdStatsEndpointConsumerBuilder sendEmptyMessageWhenIdle(
                 String sendEmptyMessageWhenIdle) {
             doSetProperty("sendEmptyMessageWhenIdle", sendEmptyMessageWhenIdle);
             return this;
@@ -217,7 +217,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffErrorThreshold(
+        default EtcdStatsEndpointConsumerBuilder backoffErrorThreshold(
                 int backoffErrorThreshold) {
             doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
             return this;
@@ -230,7 +230,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffErrorThreshold(
+        default EtcdStatsEndpointConsumerBuilder backoffErrorThreshold(
                 String backoffErrorThreshold) {
             doSetProperty("backoffErrorThreshold", backoffErrorThreshold);
             return this;
@@ -243,7 +243,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffIdleThreshold(
+        default EtcdStatsEndpointConsumerBuilder backoffIdleThreshold(
                 int backoffIdleThreshold) {
             doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
             return this;
@@ -256,7 +256,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffIdleThreshold(
+        default EtcdStatsEndpointConsumerBuilder backoffIdleThreshold(
                 String backoffIdleThreshold) {
             doSetProperty("backoffIdleThreshold", backoffIdleThreshold);
             return this;
@@ -273,7 +273,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffMultiplier(
+        default EtcdStatsEndpointConsumerBuilder backoffMultiplier(
                 int backoffMultiplier) {
             doSetProperty("backoffMultiplier", backoffMultiplier);
             return this;
@@ -290,7 +290,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder backoffMultiplier(
+        default EtcdStatsEndpointConsumerBuilder backoffMultiplier(
                 String backoffMultiplier) {
             doSetProperty("backoffMultiplier", backoffMultiplier);
             return this;
@@ -305,7 +305,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 500
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder delay(long delay) {
+        default EtcdStatsEndpointConsumerBuilder delay(long delay) {
             doSetProperty("delay", delay);
             return this;
         }
@@ -319,7 +319,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 500
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder delay(String delay) {
+        default EtcdStatsEndpointConsumerBuilder delay(String delay) {
             doSetProperty("delay", delay);
             return this;
         }
@@ -332,7 +332,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder greedy(boolean greedy) {
+        default EtcdStatsEndpointConsumerBuilder greedy(boolean greedy) {
             doSetProperty("greedy", greedy);
             return this;
         }
@@ -345,7 +345,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder greedy(String greedy) {
+        default EtcdStatsEndpointConsumerBuilder greedy(String greedy) {
             doSetProperty("greedy", greedy);
             return this;
         }
@@ -359,7 +359,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 1000
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder initialDelay(long initialDelay) {
+        default EtcdStatsEndpointConsumerBuilder initialDelay(long initialDelay) {
             doSetProperty("initialDelay", initialDelay);
             return this;
         }
@@ -373,7 +373,8 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 1000
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder initialDelay(String initialDelay) {
+        default EtcdStatsEndpointConsumerBuilder initialDelay(
+                String initialDelay) {
             doSetProperty("initialDelay", initialDelay);
             return this;
         }
@@ -387,7 +388,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 0
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder repeatCount(long repeatCount) {
+        default EtcdStatsEndpointConsumerBuilder repeatCount(long repeatCount) {
             doSetProperty("repeatCount", repeatCount);
             return this;
         }
@@ -401,7 +402,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: 0
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder repeatCount(String repeatCount) {
+        default EtcdStatsEndpointConsumerBuilder repeatCount(String repeatCount) {
             doSetProperty("repeatCount", repeatCount);
             return this;
         }
@@ -414,7 +415,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: TRACE
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder runLoggingLevel(
+        default EtcdStatsEndpointConsumerBuilder runLoggingLevel(
                 LoggingLevel runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
@@ -429,7 +430,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: TRACE
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder runLoggingLevel(
+        default EtcdStatsEndpointConsumerBuilder runLoggingLevel(
                 String runLoggingLevel) {
             doSetProperty("runLoggingLevel", runLoggingLevel);
             return this;
@@ -444,7 +445,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder scheduledExecutorService(
+        default EtcdStatsEndpointConsumerBuilder scheduledExecutorService(
                 ScheduledExecutorService scheduledExecutorService) {
             doSetProperty("scheduledExecutorService", scheduledExecutorService);
             return this;
@@ -459,7 +460,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder scheduledExecutorService(
+        default EtcdStatsEndpointConsumerBuilder scheduledExecutorService(
                 String scheduledExecutorService) {
             doSetProperty("scheduledExecutorService", scheduledExecutorService);
             return this;
@@ -473,7 +474,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: none
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder scheduler(String scheduler) {
+        default EtcdStatsEndpointConsumerBuilder scheduler(String scheduler) {
             doSetProperty("scheduler", scheduler);
             return this;
         }
@@ -486,7 +487,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder schedulerProperties(
+        default EtcdStatsEndpointConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
             doSetProperty("schedulerProperties", schedulerProperties);
             return this;
@@ -501,7 +502,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder schedulerProperties(
+        default EtcdStatsEndpointConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
             doSetProperty("schedulerProperties", schedulerProperties);
             return this;
@@ -514,7 +515,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder startScheduler(
+        default EtcdStatsEndpointConsumerBuilder startScheduler(
                 boolean startScheduler) {
             doSetProperty("startScheduler", startScheduler);
             return this;
@@ -527,7 +528,8 @@ public interface EtcdEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder startScheduler(String startScheduler) {
+        default EtcdStatsEndpointConsumerBuilder startScheduler(
+                String startScheduler) {
             doSetProperty("startScheduler", startScheduler);
             return this;
         }
@@ -539,7 +541,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: MILLISECONDS
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder timeUnit(TimeUnit timeUnit) {
+        default EtcdStatsEndpointConsumerBuilder timeUnit(TimeUnit timeUnit) {
             doSetProperty("timeUnit", timeUnit);
             return this;
         }
@@ -552,7 +554,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: MILLISECONDS
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder timeUnit(String timeUnit) {
+        default EtcdStatsEndpointConsumerBuilder timeUnit(String timeUnit) {
             doSetProperty("timeUnit", timeUnit);
             return this;
         }
@@ -565,7 +567,8 @@ public interface EtcdEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder useFixedDelay(boolean useFixedDelay) {
+        default EtcdStatsEndpointConsumerBuilder useFixedDelay(
+                boolean useFixedDelay) {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
@@ -578,7 +581,8 @@ public interface EtcdEndpointBuilderFactory {
          * Default: true
          * Group: scheduler
          */
-        default EtcdEndpointConsumerBuilder useFixedDelay(String useFixedDelay) {
+        default EtcdStatsEndpointConsumerBuilder useFixedDelay(
+                String useFixedDelay) {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
@@ -589,7 +593,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointConsumerBuilder password(String password) {
+        default EtcdStatsEndpointConsumerBuilder password(String password) {
             doSetProperty("password", password);
             return this;
         }
@@ -601,7 +605,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointConsumerBuilder sslContextParameters(
+        default EtcdStatsEndpointConsumerBuilder sslContextParameters(
                 Object sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -614,7 +618,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointConsumerBuilder sslContextParameters(
+        default EtcdStatsEndpointConsumerBuilder sslContextParameters(
                 String sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -626,20 +630,20 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointConsumerBuilder userName(String userName) {
+        default EtcdStatsEndpointConsumerBuilder userName(String userName) {
             doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint consumers for the Etcd component.
+     * Advanced builder for endpoint consumers for the Etcd Stats component.
      */
-    public interface AdvancedEtcdEndpointConsumerBuilder
+    public interface AdvancedEtcdStatsEndpointConsumerBuilder
             extends
                 EndpointConsumerBuilder {
-        default EtcdEndpointConsumerBuilder basic() {
-            return (EtcdEndpointConsumerBuilder) this;
+        default EtcdStatsEndpointConsumerBuilder basic() {
+            return (EtcdStatsEndpointConsumerBuilder) this;
         }
         /**
          * To let the consumer use a custom ExceptionHandler. Notice if the
@@ -652,7 +656,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder exceptionHandler(
+        default AdvancedEtcdStatsEndpointConsumerBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -668,7 +672,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder exceptionHandler(
+        default AdvancedEtcdStatsEndpointConsumerBuilder exceptionHandler(
                 String exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -680,7 +684,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder exchangePattern(
+        default AdvancedEtcdStatsEndpointConsumerBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -693,7 +697,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder exchangePattern(
+        default AdvancedEtcdStatsEndpointConsumerBuilder exchangePattern(
                 String exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -701,24 +705,26 @@ public interface EtcdEndpointBuilderFactory {
         /**
          * The index to watch from.
          * 
-         * The option is a: <code>java.lang.Long</code> type.
+         * The option is a: <code>long</code> type.
          * 
          * Default: 0
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder fromIndex(Long fromIndex) {
+        default AdvancedEtcdStatsEndpointConsumerBuilder fromIndex(
+                long fromIndex) {
             doSetProperty("fromIndex", fromIndex);
             return this;
         }
         /**
          * The index to watch from.
          * 
-         * The option will be converted to a <code>java.lang.Long</code> type.
+         * The option will be converted to a <code>long</code> type.
          * 
          * Default: 0
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder fromIndex(String fromIndex) {
+        default AdvancedEtcdStatsEndpointConsumerBuilder fromIndex(
+                String fromIndex) {
             doSetProperty("fromIndex", fromIndex);
             return this;
         }
@@ -733,7 +739,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder pollStrategy(
+        default AdvancedEtcdStatsEndpointConsumerBuilder pollStrategy(
                 PollingConsumerPollStrategy pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
@@ -749,7 +755,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedEtcdEndpointConsumerBuilder pollStrategy(
+        default AdvancedEtcdStatsEndpointConsumerBuilder pollStrategy(
                 String pollStrategy) {
             doSetProperty("pollStrategy", pollStrategy);
             return this;
@@ -763,7 +769,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointConsumerBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointConsumerBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -777,7 +783,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointConsumerBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointConsumerBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -791,7 +797,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointConsumerBuilder synchronous(
+        default AdvancedEtcdStatsEndpointConsumerBuilder synchronous(
                 boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -805,7 +811,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointConsumerBuilder synchronous(
+        default AdvancedEtcdStatsEndpointConsumerBuilder synchronous(
                 String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -813,13 +819,13 @@ public interface EtcdEndpointBuilderFactory {
     }
 
     /**
-     * Builder for endpoint producers for the Etcd component.
+     * Builder for endpoint producers for the Etcd Stats component.
      */
-    public interface EtcdEndpointProducerBuilder
+    public interface EtcdStatsEndpointProducerBuilder
             extends
                 EndpointProducerBuilder {
-        default AdvancedEtcdEndpointProducerBuilder advanced() {
-            return (AdvancedEtcdEndpointProducerBuilder) this;
+        default AdvancedEtcdStatsEndpointProducerBuilder advanced() {
+            return (AdvancedEtcdStatsEndpointProducerBuilder) this;
         }
         /**
          * To apply an action recursively.
@@ -829,7 +835,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointProducerBuilder recursive(boolean recursive) {
+        default EtcdStatsEndpointProducerBuilder recursive(boolean recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -841,7 +847,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointProducerBuilder recursive(String recursive) {
+        default EtcdStatsEndpointProducerBuilder recursive(String recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -853,7 +859,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: /services/
          * Group: common
          */
-        default EtcdEndpointProducerBuilder servicePath(String servicePath) {
+        default EtcdStatsEndpointProducerBuilder servicePath(String servicePath) {
             doSetProperty("servicePath", servicePath);
             return this;
         }
@@ -864,7 +870,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointProducerBuilder timeout(Long timeout) {
+        default EtcdStatsEndpointProducerBuilder timeout(Long timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -875,7 +881,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointProducerBuilder timeout(String timeout) {
+        default EtcdStatsEndpointProducerBuilder timeout(String timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -887,7 +893,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: http://localhost:2379,http://localhost:4001
          * Group: common
          */
-        default EtcdEndpointProducerBuilder uris(String uris) {
+        default EtcdStatsEndpointProducerBuilder uris(String uris) {
             doSetProperty("uris", uris);
             return this;
         }
@@ -907,7 +913,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EtcdEndpointProducerBuilder lazyStartProducer(
+        default EtcdStatsEndpointProducerBuilder lazyStartProducer(
                 boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
@@ -928,7 +934,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EtcdEndpointProducerBuilder lazyStartProducer(
+        default EtcdStatsEndpointProducerBuilder lazyStartProducer(
                 String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
@@ -940,7 +946,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EtcdEndpointProducerBuilder timeToLive(Integer timeToLive) {
+        default EtcdStatsEndpointProducerBuilder timeToLive(Integer timeToLive) {
             doSetProperty("timeToLive", timeToLive);
             return this;
         }
@@ -952,7 +958,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: producer
          */
-        default EtcdEndpointProducerBuilder timeToLive(String timeToLive) {
+        default EtcdStatsEndpointProducerBuilder timeToLive(String timeToLive) {
             doSetProperty("timeToLive", timeToLive);
             return this;
         }
@@ -963,7 +969,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointProducerBuilder password(String password) {
+        default EtcdStatsEndpointProducerBuilder password(String password) {
             doSetProperty("password", password);
             return this;
         }
@@ -975,7 +981,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointProducerBuilder sslContextParameters(
+        default EtcdStatsEndpointProducerBuilder sslContextParameters(
                 Object sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -988,7 +994,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointProducerBuilder sslContextParameters(
+        default EtcdStatsEndpointProducerBuilder sslContextParameters(
                 String sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -1000,20 +1006,20 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointProducerBuilder userName(String userName) {
+        default EtcdStatsEndpointProducerBuilder userName(String userName) {
             doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint producers for the Etcd component.
+     * Advanced builder for endpoint producers for the Etcd Stats component.
      */
-    public interface AdvancedEtcdEndpointProducerBuilder
+    public interface AdvancedEtcdStatsEndpointProducerBuilder
             extends
                 EndpointProducerBuilder {
-        default EtcdEndpointProducerBuilder basic() {
-            return (EtcdEndpointProducerBuilder) this;
+        default EtcdStatsEndpointProducerBuilder basic() {
+            return (EtcdStatsEndpointProducerBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -1024,7 +1030,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointProducerBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointProducerBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -1038,7 +1044,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointProducerBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointProducerBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -1052,7 +1058,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointProducerBuilder synchronous(
+        default AdvancedEtcdStatsEndpointProducerBuilder synchronous(
                 boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -1066,7 +1072,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointProducerBuilder synchronous(
+        default AdvancedEtcdStatsEndpointProducerBuilder synchronous(
                 String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
@@ -1074,14 +1080,14 @@ public interface EtcdEndpointBuilderFactory {
     }
 
     /**
-     * Builder for endpoint for the Etcd component.
+     * Builder for endpoint for the Etcd Stats component.
      */
-    public interface EtcdEndpointBuilder
+    public interface EtcdStatsEndpointBuilder
             extends
-                EtcdEndpointConsumerBuilder,
-                EtcdEndpointProducerBuilder {
-        default AdvancedEtcdEndpointBuilder advanced() {
-            return (AdvancedEtcdEndpointBuilder) this;
+                EtcdStatsEndpointConsumerBuilder,
+                EtcdStatsEndpointProducerBuilder {
+        default AdvancedEtcdStatsEndpointBuilder advanced() {
+            return (AdvancedEtcdStatsEndpointBuilder) this;
         }
         /**
          * To apply an action recursively.
@@ -1091,7 +1097,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointBuilder recursive(boolean recursive) {
+        default EtcdStatsEndpointBuilder recursive(boolean recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -1103,7 +1109,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: common
          */
-        default EtcdEndpointBuilder recursive(String recursive) {
+        default EtcdStatsEndpointBuilder recursive(String recursive) {
             doSetProperty("recursive", recursive);
             return this;
         }
@@ -1115,7 +1121,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: /services/
          * Group: common
          */
-        default EtcdEndpointBuilder servicePath(String servicePath) {
+        default EtcdStatsEndpointBuilder servicePath(String servicePath) {
             doSetProperty("servicePath", servicePath);
             return this;
         }
@@ -1126,7 +1132,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointBuilder timeout(Long timeout) {
+        default EtcdStatsEndpointBuilder timeout(Long timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -1137,7 +1143,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: common
          */
-        default EtcdEndpointBuilder timeout(String timeout) {
+        default EtcdStatsEndpointBuilder timeout(String timeout) {
             doSetProperty("timeout", timeout);
             return this;
         }
@@ -1149,7 +1155,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: http://localhost:2379,http://localhost:4001
          * Group: common
          */
-        default EtcdEndpointBuilder uris(String uris) {
+        default EtcdStatsEndpointBuilder uris(String uris) {
             doSetProperty("uris", uris);
             return this;
         }
@@ -1160,7 +1166,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointBuilder password(String password) {
+        default EtcdStatsEndpointBuilder password(String password) {
             doSetProperty("password", password);
             return this;
         }
@@ -1172,7 +1178,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointBuilder sslContextParameters(
+        default EtcdStatsEndpointBuilder sslContextParameters(
                 Object sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -1185,7 +1191,7 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointBuilder sslContextParameters(
+        default EtcdStatsEndpointBuilder sslContextParameters(
                 String sslContextParameters) {
             doSetProperty("sslContextParameters", sslContextParameters);
             return this;
@@ -1197,21 +1203,21 @@ public interface EtcdEndpointBuilderFactory {
          * 
          * Group: security
          */
-        default EtcdEndpointBuilder userName(String userName) {
+        default EtcdStatsEndpointBuilder userName(String userName) {
             doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the Etcd component.
+     * Advanced builder for endpoint for the Etcd Stats component.
      */
-    public interface AdvancedEtcdEndpointBuilder
+    public interface AdvancedEtcdStatsEndpointBuilder
             extends
-                AdvancedEtcdEndpointConsumerBuilder,
-                AdvancedEtcdEndpointProducerBuilder {
-        default EtcdEndpointBuilder basic() {
-            return (EtcdEndpointBuilder) this;
+                AdvancedEtcdStatsEndpointConsumerBuilder,
+                AdvancedEtcdStatsEndpointProducerBuilder {
+        default EtcdStatsEndpointBuilder basic() {
+            return (EtcdStatsEndpointBuilder) this;
         }
         /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
@@ -1222,7 +1228,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -1236,7 +1242,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdStatsEndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -1250,7 +1256,7 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointBuilder synchronous(boolean synchronous) {
+        default AdvancedEtcdStatsEndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -1263,15 +1269,15 @@ public interface EtcdEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedEtcdEndpointBuilder synchronous(String synchronous) {
+        default AdvancedEtcdStatsEndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
-    public interface EtcdBuilders {
+    public interface EtcdStatsBuilders {
         /**
-         * Etcd (camel-etcd)
+         * Etcd Stats (camel-etcd)
          * The camel etcd component allows you to work with Etcd, a distributed
          * reliable key-value store.
          * 
@@ -1279,21 +1285,17 @@ public interface EtcdEndpointBuilderFactory {
          * Since: 2.18
          * Maven coordinates: org.apache.camel:camel-etcd
          * 
-         * Syntax: <code>etcd:namespace/path</code>
-         * 
-         * Path parameter: namespace (required)
-         * The API namespace to use
-         * The value can be one of: keys, stats, watch
+         * Syntax: <code>etcd-stats:path</code>
          * 
          * Path parameter: path
          * The path the endpoint refers to
          */
-        default EtcdEndpointBuilder etcd(String path) {
-            return EtcdEndpointBuilderFactory.etcd(path);
+        default EtcdStatsEndpointBuilder etcdStats(String path) {
+            return EtcdStatsEndpointBuilderFactory.etcdStats(path);
         }
     }
     /**
-     * Etcd (camel-etcd)
+     * Etcd Stats (camel-etcd)
      * The camel etcd component allows you to work with Etcd, a distributed
      * reliable key-value store.
      * 
@@ -1301,21 +1303,17 @@ public interface EtcdEndpointBuilderFactory {
      * Since: 2.18
      * Maven coordinates: org.apache.camel:camel-etcd
      * 
-     * Syntax: <code>etcd:namespace/path</code>
-     * 
-     * Path parameter: namespace (required)
-     * The API namespace to use
-     * The value can be one of: keys, stats, watch
+     * Syntax: <code>etcd-stats:path</code>
      * 
      * Path parameter: path
      * The path the endpoint refers to
      */
-    static EtcdEndpointBuilder etcd(String path) {
-        class EtcdEndpointBuilderImpl extends AbstractEndpointBuilder implements EtcdEndpointBuilder, AdvancedEtcdEndpointBuilder {
-            public EtcdEndpointBuilderImpl(String path) {
-                super("etcd", path);
+    static EtcdStatsEndpointBuilder etcdStats(String path) {
+        class EtcdStatsEndpointBuilderImpl extends AbstractEndpointBuilder implements EtcdStatsEndpointBuilder, AdvancedEtcdStatsEndpointBuilder {
+            public EtcdStatsEndpointBuilderImpl(String path) {
+                super("etcd-stats", path);
             }
         }
-        return new EtcdEndpointBuilderImpl(path);
+        return new EtcdStatsEndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdWatchEndpointBuilderFactory.java
similarity index 53%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdWatchEndpointBuilderFactory.java
index 917c78f..aec1368 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IgniteEventsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EtcdWatchEndpointBuilderFactory.java
@@ -24,25 +24,21 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 
 /**
- * The Ignite Events endpoint is one of camel-ignite endpoints which allows you
- * to receive events from the Ignite cluster by creating a local event listener.
- * This endpoint only supports consumers. The Exchanges created by this consumer
- * put the received Event object into the body of the IN message.
+ * The camel etcd component allows you to work with Etcd, a distributed reliable
+ * key-value store.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface IgniteEventsEndpointBuilderFactory {
+public interface EtcdWatchEndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the Ignite Events component.
+     * Builder for endpoint for the Etcd Watch component.
      */
-    public interface IgniteEventsEndpointBuilder
-            extends
-                EndpointConsumerBuilder {
-        default AdvancedIgniteEventsEndpointBuilder advanced() {
-            return (AdvancedIgniteEventsEndpointBuilder) this;
+    public interface EtcdWatchEndpointBuilder extends EndpointConsumerBuilder {
+        default AdvancedEtcdWatchEndpointBuilder advanced() {
+            return (AdvancedEtcdWatchEndpointBuilder) this;
         }
         /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
@@ -58,7 +54,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder bridgeErrorHandler(
+        default EtcdWatchEndpointBuilder bridgeErrorHandler(
                 boolean bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
@@ -77,119 +73,165 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder bridgeErrorHandler(
+        default EtcdWatchEndpointBuilder bridgeErrorHandler(
                 String bridgeErrorHandler) {
             doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
             return this;
         }
         /**
-         * The cluster group expression.
+         * To apply an action recursively.
          * 
-         * The option is a:
-         * <code>org.apache.camel.component.ignite.ClusterGroupExpression</code>
-         * type.
+         * The option is a: <code>boolean</code> type.
          * 
+         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder clusterGroupExpression(
-                Object clusterGroupExpression) {
-            doSetProperty("clusterGroupExpression", clusterGroupExpression);
+        default EtcdWatchEndpointBuilder recursive(boolean recursive) {
+            doSetProperty("recursive", recursive);
             return this;
         }
         /**
-         * The cluster group expression.
+         * To apply an action recursively.
          * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.ignite.ClusterGroupExpression</code>
-         * type.
+         * The option will be converted to a <code>boolean</code> type.
          * 
+         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder clusterGroupExpression(
-                String clusterGroupExpression) {
-            doSetProperty("clusterGroupExpression", clusterGroupExpression);
+        default EtcdWatchEndpointBuilder recursive(String recursive) {
+            doSetProperty("recursive", recursive);
             return this;
         }
         /**
-         * The event types to subscribe to as a comma-separated string of event
-         * constants as defined in EventType . For example:
-         * EVT_CACHE_ENTRY_CREATED,EVT_CACHE_OBJECT_REMOVED,EVT_IGFS_DIR_CREATED.
+         * The path to look for for service discovery.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Default: EVTS_ALL
+         * Default: /services/
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder events(String events) {
-            doSetProperty("events", events);
+        default EtcdWatchEndpointBuilder servicePath(String servicePath) {
+            doSetProperty("servicePath", servicePath);
+            return this;
+        }
+        /**
+         * To set the URIs the client connects.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Default: http://localhost:2379,http://localhost:4001
+         * Group: common
+         */
+        default EtcdWatchEndpointBuilder uris(String uris) {
+            doSetProperty("uris", uris);
             return this;
         }
         /**
-         * Sets whether to propagate the incoming body if the return type of the
-         * underlying Ignite operation is void.
+         * To send an empty message in case of timeout watching for a key.
          * 
          * The option is a: <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder propagateIncomingBodyIfNoReturnValue(
-                boolean propagateIncomingBodyIfNoReturnValue) {
-            doSetProperty("propagateIncomingBodyIfNoReturnValue", propagateIncomingBodyIfNoReturnValue);
+        default EtcdWatchEndpointBuilder sendEmptyExchangeOnTimeout(
+                boolean sendEmptyExchangeOnTimeout) {
+            doSetProperty("sendEmptyExchangeOnTimeout", sendEmptyExchangeOnTimeout);
             return this;
         }
         /**
-         * Sets whether to propagate the incoming body if the return type of the
-         * underlying Ignite operation is void.
+         * To send an empty message in case of timeout watching for a key.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
-         * Default: true
+         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder propagateIncomingBodyIfNoReturnValue(
-                String propagateIncomingBodyIfNoReturnValue) {
-            doSetProperty("propagateIncomingBodyIfNoReturnValue", propagateIncomingBodyIfNoReturnValue);
+        default EtcdWatchEndpointBuilder sendEmptyExchangeOnTimeout(
+                String sendEmptyExchangeOnTimeout) {
+            doSetProperty("sendEmptyExchangeOnTimeout", sendEmptyExchangeOnTimeout);
             return this;
         }
         /**
-         * Sets whether to treat Collections as cache objects or as Collections
-         * of items to insert/update/compute, etc.
+         * To set the maximum time an action could take to complete.
          * 
-         * The option is a: <code>boolean</code> type.
+         * The option is a: <code>java.lang.Long</code> type.
          * 
-         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder treatCollectionsAsCacheObjects(
-                boolean treatCollectionsAsCacheObjects) {
-            doSetProperty("treatCollectionsAsCacheObjects", treatCollectionsAsCacheObjects);
+        default EtcdWatchEndpointBuilder timeout(Long timeout) {
+            doSetProperty("timeout", timeout);
             return this;
         }
         /**
-         * Sets whether to treat Collections as cache objects or as Collections
-         * of items to insert/update/compute, etc.
+         * To set the maximum time an action could take to complete.
          * 
-         * The option will be converted to a <code>boolean</code> type.
+         * The option will be converted to a <code>java.lang.Long</code> type.
          * 
-         * Default: false
          * Group: consumer
          */
-        default IgniteEventsEndpointBuilder treatCollectionsAsCacheObjects(
-                String treatCollectionsAsCacheObjects) {
-            doSetProperty("treatCollectionsAsCacheObjects", treatCollectionsAsCacheObjects);
+        default EtcdWatchEndpointBuilder timeout(String timeout) {
+            doSetProperty("timeout", timeout);
+            return this;
+        }
+        /**
+         * The password to use for basic authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default EtcdWatchEndpointBuilder password(String password) {
+            doSetProperty("password", password);
+            return this;
+        }
+        /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default EtcdWatchEndpointBuilder sslContextParameters(
+                Object sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * To configure security using SSLContextParameters.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
+         * 
+         * Group: security
+         */
+        default EtcdWatchEndpointBuilder sslContextParameters(
+                String sslContextParameters) {
+            doSetProperty("sslContextParameters", sslContextParameters);
+            return this;
+        }
+        /**
+         * The user name to use for basic authentication.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default EtcdWatchEndpointBuilder userName(String userName) {
+            doSetProperty("userName", userName);
             return this;
         }
     }
 
     /**
-     * Advanced builder for endpoint for the Ignite Events component.
+     * Advanced builder for endpoint for the Etcd Watch component.
      */
-    public interface AdvancedIgniteEventsEndpointBuilder
+    public interface AdvancedEtcdWatchEndpointBuilder
             extends
                 EndpointConsumerBuilder {
-        default IgniteEventsEndpointBuilder basic() {
-            return (IgniteEventsEndpointBuilder) this;
+        default EtcdWatchEndpointBuilder basic() {
+            return (EtcdWatchEndpointBuilder) this;
         }
         /**
          * To let the consumer use a custom ExceptionHandler. Notice if the
@@ -202,7 +244,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedIgniteEventsEndpointBuilder exceptionHandler(
+        default AdvancedEtcdWatchEndpointBuilder exceptionHandler(
                 ExceptionHandler exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -218,7 +260,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedIgniteEventsEndpointBuilder exceptionHandler(
+        default AdvancedEtcdWatchEndpointBuilder exceptionHandler(
                 String exceptionHandler) {
             doSetProperty("exceptionHandler", exceptionHandler);
             return this;
@@ -230,7 +272,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedIgniteEventsEndpointBuilder exchangePattern(
+        default AdvancedEtcdWatchEndpointBuilder exchangePattern(
                 ExchangePattern exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
@@ -243,12 +285,36 @@ public interface IgniteEventsEndpointBuilderFactory {
          * 
          * Group: consumer (advanced)
          */
-        default AdvancedIgniteEventsEndpointBuilder exchangePattern(
+        default AdvancedEtcdWatchEndpointBuilder exchangePattern(
                 String exchangePattern) {
             doSetProperty("exchangePattern", exchangePattern);
             return this;
         }
         /**
+         * The index to watch from.
+         * 
+         * The option is a: <code>long</code> type.
+         * 
+         * Default: 0
+         * Group: consumer (advanced)
+         */
+        default AdvancedEtcdWatchEndpointBuilder fromIndex(long fromIndex) {
+            doSetProperty("fromIndex", fromIndex);
+            return this;
+        }
+        /**
+         * The index to watch from.
+         * 
+         * The option will be converted to a <code>long</code> type.
+         * 
+         * Default: 0
+         * Group: consumer (advanced)
+         */
+        default AdvancedEtcdWatchEndpointBuilder fromIndex(String fromIndex) {
+            doSetProperty("fromIndex", fromIndex);
+            return this;
+        }
+        /**
          * Whether the endpoint should use basic property binding (Camel 2.x) or
          * the newer property binding with additional capabilities.
          * 
@@ -257,7 +323,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedIgniteEventsEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdWatchEndpointBuilder basicPropertyBinding(
                 boolean basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -271,7 +337,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedIgniteEventsEndpointBuilder basicPropertyBinding(
+        default AdvancedEtcdWatchEndpointBuilder basicPropertyBinding(
                 String basicPropertyBinding) {
             doSetProperty("basicPropertyBinding", basicPropertyBinding);
             return this;
@@ -285,8 +351,7 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedIgniteEventsEndpointBuilder synchronous(
-                boolean synchronous) {
+        default AdvancedEtcdWatchEndpointBuilder synchronous(boolean synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
@@ -299,58 +364,51 @@ public interface IgniteEventsEndpointBuilderFactory {
          * Default: false
          * Group: advanced
          */
-        default AdvancedIgniteEventsEndpointBuilder synchronous(
-                String synchronous) {
+        default AdvancedEtcdWatchEndpointBuilder synchronous(String synchronous) {
             doSetProperty("synchronous", synchronous);
             return this;
         }
     }
 
-    public interface IgniteEventsBuilders {
+    public interface EtcdWatchBuilders {
         /**
-         * Ignite Events (camel-ignite)
-         * The Ignite Events endpoint is one of camel-ignite endpoints which
-         * allows you to receive events from the Ignite cluster by creating a
-         * local event listener. This endpoint only supports consumers. The
-         * Exchanges created by this consumer put the received Event object into
-         * the body of the IN message.
+         * Etcd Watch (camel-etcd)
+         * The camel etcd component allows you to work with Etcd, a distributed
+         * reliable key-value store.
          * 
-         * Category: nosql,cache,compute,messaging,data
-         * Since: 2.17
-         * Maven coordinates: org.apache.camel:camel-ignite
+         * Category: clustering,database
+         * Since: 2.18
+         * Maven coordinates: org.apache.camel:camel-etcd
          * 
-         * Syntax: <code>ignite-events:endpointId</code>
+         * Syntax: <code>etcd-watch:path</code>
          * 
-         * Path parameter: endpointId
-         * The endpoint ID (not used).
+         * Path parameter: path
+         * The path the endpoint refers to
          */
-        default IgniteEventsEndpointBuilder igniteEvents(String path) {
-            return IgniteEventsEndpointBuilderFactory.igniteEvents(path);
+        default EtcdWatchEndpointBuilder etcdWatch(String path) {
+            return EtcdWatchEndpointBuilderFactory.etcdWatch(path);
         }
     }
     /**
-     * Ignite Events (camel-ignite)
-     * The Ignite Events endpoint is one of camel-ignite endpoints which allows
-     * you to receive events from the Ignite cluster by creating a local event
-     * listener. This endpoint only supports consumers. The Exchanges created by
-     * this consumer put the received Event object into the body of the IN
-     * message.
+     * Etcd Watch (camel-etcd)
+     * The camel etcd component allows you to work with Etcd, a distributed
+     * reliable key-value store.
      * 
-     * Category: nosql,cache,compute,messaging,data
-     * Since: 2.17
-     * Maven coordinates: org.apache.camel:camel-ignite
+     * Category: clustering,database
+     * Since: 2.18
+     * Maven coordinates: org.apache.camel:camel-etcd
      * 
-     * Syntax: <code>ignite-events:endpointId</code>
+     * Syntax: <code>etcd-watch:path</code>
      * 
-     * Path parameter: endpointId
-     * The endpoint ID (not used).
+     * Path parameter: path
+     * The path the endpoint refers to
      */
-    static IgniteEventsEndpointBuilder igniteEvents(String path) {
-        class IgniteEventsEndpointBuilderImpl extends AbstractEndpointBuilder implements IgniteEventsEndpointBuilder, AdvancedIgniteEventsEndpointBuilder {
-            public IgniteEventsEndpointBuilderImpl(String path) {
-                super("ignite-events", path);
+    static EtcdWatchEndpointBuilder etcdWatch(String path) {
+        class EtcdWatchEndpointBuilderImpl extends AbstractEndpointBuilder implements EtcdWatchEndpointBuilder, AdvancedEtcdWatchEndpointBuilder {
+            public EtcdWatchEndpointBuilderImpl(String path) {
+                super("etcd-watch", path);
             }
         }
-        return new IgniteEventsEndpointBuilderImpl(path);
+        return new EtcdWatchEndpointBuilderImpl(path);
     }
 }
\ No newline at end of file
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
index 9d1d382..e136e29 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FacebookEndpointBuilderFactory.java
@@ -29,10 +29,7 @@ import org.apache.camel.spi.ExceptionHandler;
 
 /**
  * The Facebook component provides access to all of the Facebook APIs accessible
- * using Facebook4J. It allows producing messages to retrieve, add, and delete
- * posts, likes, comments, photos, albums, videos, photos, checkins, locations,
- * links, etc. It also supports APIs that allow polling for posts, users,
- * checkins, groups, locations, etc.
+ * using Facebook4J.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -5409,11 +5406,7 @@ public interface FacebookEndpointBuilderFactory {
         /**
          * Facebook (camel-facebook)
          * The Facebook component provides access to all of the Facebook APIs
-         * accessible using Facebook4J. It allows producing messages to
-         * retrieve, add, and delete posts, likes, comments, photos, albums,
-         * videos, photos, checkins, locations, links, etc. It also supports
-         * APIs that allow polling for posts, users, checkins, groups,
-         * locations, etc.
+         * accessible using Facebook4J.
          * 
          * Category: social
          * Since: 2.14
@@ -5431,10 +5424,7 @@ public interface FacebookEndpointBuilderFactory {
     /**
      * Facebook (camel-facebook)
      * The Facebook component provides access to all of the Facebook APIs
-     * accessible using Facebook4J. It allows producing messages to retrieve,
-     * add, and delete posts, likes, comments, photos, albums, videos, photos,
-     * checkins, locations, links, etc. It also supports APIs that allow polling
-     * for posts, users, checkins, groups, locations, etc.
+     * accessible using Facebook4J.
      * 
      * Category: social
      * Since: 2.14
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
index e5565e4..a9f548c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FileEndpointBuilderFactory.java
@@ -80,7 +80,7 @@ public interface FileEndpointBuilderFactory {
          * This option configures what file name to use. Either you can specify
          * a fixed name. Or you can use dynamic placeholders.The done file is
          * always expected in the same folder as the original file. Only
-         * ${file.name} and ${file.name.noext} is supported as dynamic
+         * ${file.name} and ${file.name.next} is supported as dynamic
          * placeholders.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -823,41 +823,41 @@ public interface FileEndpointBuilderFactory {
          * Used by consumer, to only poll the files if it has exclusive
          * read-lock on the file (i.e. the file is not in-progress or being
          * written). Camel will wait until the file lock is granted. This option
-         * provides the build in strategies:\n\n - none - No read lock is in
-         * use\n - markerFile - Camel creates a marker file (fileName.camelLock)
-         * and then holds a lock on it. This option is not available for the FTP
-         * component\n - changed - Changed is using file length/modification
+         * provides the build in strategies: - none - No read lock is in use -
+         * markerFile - Camel creates a marker file (fileName.camelLock) and
+         * then holds a lock on it. This option is not available for the FTP
+         * component - changed - Changed is using file length/modification
          * timestamp to detect whether the file is currently being copied or
          * not. Will at least use 1 sec to determine this, so this option cannot
          * consume files as fast as the others, but can be more reliable as the
          * JDK IO API cannot always determine whether a file is currently being
          * used by another process. The option readLockCheckInterval can be used
-         * to set the check frequency.\n - fileLock - is for using
+         * to set the check frequency. - fileLock - is for using
          * java.nio.channels.FileLock. This option is not avail for Windows OS
          * and the FTP component. This approach should be avoided when accessing
          * a remote file system via a mount/share unless that file system
-         * supports distributed file locks.\n - rename - rename is for using a
-         * try to rename the file as a test if we can get exclusive read-lock.\n
-         * - idempotent - (only for file component) idempotent is for using a
+         * supports distributed file locks. - rename - rename is for using a try
+         * to rename the file as a test if we can get exclusive read-lock. -
+         * idempotent - (only for file component) idempotent is for using a
          * idempotentRepository as the read-lock. This allows to use read locks
          * that supports clustering if the idempotent repository implementation
-         * supports that.\n - idempotent-changed - (only for file component)
+         * supports that. - idempotent-changed - (only for file component)
          * idempotent-changed is for using a idempotentRepository and changed as
          * the combined read-lock. This allows to use read locks that supports
-         * clustering if the idempotent repository implementation supports
-         * that.\n - idempotent-rename - (only for file component)
-         * idempotent-rename is for using a idempotentRepository and rename as
-         * the combined read-lock. This allows to use read locks that supports
-         * clustering if the idempotent repository implementation supports
-         * that.\n \nNotice: The various read locks is not all suited to work in
-         * clustered mode, where concurrent consumers on different nodes is
-         * competing for the same files on a shared file system. The markerFile
-         * using a close to atomic operation to create the empty marker file,
-         * but its not guaranteed to work in a cluster. The fileLock may work
-         * better but then the file system need to support distributed file
-         * locks, and so on. Using the idempotent read lock can support
-         * clustering if the idempotent repository supports clustering, such as
-         * Hazelcast Component or Infinispan.
+         * clustering if the idempotent repository implementation supports that.
+         * - idempotent-rename - (only for file component) idempotent-rename is
+         * for using a idempotentRepository and rename as the combined
+         * read-lock. This allows to use read locks that supports clustering if
+         * the idempotent repository implementation supports that.Notice: The
+         * various read locks is not all suited to work in clustered mode, where
+         * concurrent consumers on different nodes is competing for the same
+         * files on a shared file system. The markerFile using a close to atomic
+         * operation to create the empty marker file, but its not guaranteed to
+         * work in a cluster. The fileLock may work better but then the file
+         * system need to support distributed file locks, and so on. Using the
+         * idempotent read lock can support clustering if the idempotent
+         * repository supports clustering, such as Hazelcast Component or
+         * Infinispan.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -2022,7 +2022,7 @@ public interface FileEndpointBuilderFactory {
          * Whether to enable probing of the content type. If enable then the
          * consumer uses Files#probeContentType(java.nio.file.Path) to determine
          * the content-type of the file, and store that as a header with key
-         * Exchange#FILE_CONTENT_TYPE on the Message .
+         * Exchange#FILE_CONTENT_TYPE on the Message.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -2038,7 +2038,7 @@ public interface FileEndpointBuilderFactory {
          * Whether to enable probing of the content type. If enable then the
          * consumer uses Files#probeContentType(java.nio.file.Path) to determine
          * the content-type of the file, and store that as a header with key
-         * Exchange#FILE_CONTENT_TYPE on the Message .
+         * Exchange#FILE_CONTENT_TYPE on the Message.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -2371,7 +2371,7 @@ public interface FileEndpointBuilderFactory {
          * This option configures what file name to use. Either you can specify
          * a fixed name. Or you can use dynamic placeholders.The done file is
          * always expected in the same folder as the original file. Only
-         * ${file.name} and ${file.name.noext} is supported as dynamic
+         * ${file.name} and ${file.name.next} is supported as dynamic
          * placeholders.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -2452,20 +2452,20 @@ public interface FileEndpointBuilderFactory {
         }
         /**
          * What to do if a file already exists with the same name. Override,
-         * which is the default, replaces the existing file. \n\n - Append -
-         * adds content to the existing file.\n - Fail - throws a
+         * which is the default, replaces the existing file. - Append - adds
+         * content to the existing file. - Fail - throws a
          * GenericFileOperationException, indicating that there is already an
-         * existing file.\n - Ignore - silently ignores the problem and does not
-         * override the existing file, but assumes everything is okay.\n - Move
-         * - option requires to use the moveExisting option to be configured as
+         * existing file. - Ignore - silently ignores the problem and does not
+         * override the existing file, but assumes everything is okay. - Move -
+         * option requires to use the moveExisting option to be configured as
          * well. The option eagerDeleteTargetFile can be used to control what to
          * do if an moving the file, and there exists already an existing file,
          * otherwise causing the move operation to fail. The Move option will
-         * move any existing files, before writing the target file.\n -
-         * TryRename is only applicable if tempFileName option is in use. This
-         * allows to try renaming the file from the temporary name to the actual
-         * name, without doing any exists check. This check may be faster on
-         * some file systems and especially FTP servers.
+         * move any existing files, before writing the target file. - TryRename
+         * is only applicable if tempFileName option is in use. This allows to
+         * try renaming the file from the temporary name to the actual name,
+         * without doing any exists check. This check may be faster on some file
+         * systems and especially FTP servers.
          * 
          * The option is a:
          * <code>org.apache.camel.component.file.GenericFileExist</code> type.
@@ -2479,20 +2479,20 @@ public interface FileEndpointBuilderFactory {
         }
         /**
          * What to do if a file already exists with the same name. Override,
-         * which is the default, replaces the existing file. \n\n - Append -
-         * adds content to the existing file.\n - Fail - throws a
+         * which is the default, replaces the existing file. - Append - adds
+         * content to the existing file. - Fail - throws a
          * GenericFileOperationException, indicating that there is already an
-         * existing file.\n - Ignore - silently ignores the problem and does not
-         * override the existing file, but assumes everything is okay.\n - Move
-         * - option requires to use the moveExisting option to be configured as
+         * existing file. - Ignore - silently ignores the problem and does not
+         * override the existing file, but assumes everything is okay. - Move -
+         * option requires to use the moveExisting option to be configured as
          * well. The option eagerDeleteTargetFile can be used to control what to
          * do if an moving the file, and there exists already an existing file,
          * otherwise causing the move operation to fail. The Move option will
-         * move any existing files, before writing the target file.\n -
-         * TryRename is only applicable if tempFileName option is in use. This
-         * allows to try renaming the file from the temporary name to the actual
-         * name, without doing any exists check. This check may be faster on
-         * some file systems and especially FTP servers.
+         * move any existing files, before writing the target file. - TryRename
+         * is only applicable if tempFileName option is in use. This allows to
+         * try renaming the file from the temporary name to the actual name,
+         * without doing any exists check. This check may be faster on some file
+         * systems and especially FTP servers.
          * 
          * The option will be converted to a
          * <code>org.apache.camel.component.file.GenericFileExist</code> type.
@@ -3149,7 +3149,7 @@ public interface FileEndpointBuilderFactory {
          * This option configures what file name to use. Either you can specify
          * a fixed name. Or you can use dynamic placeholders.The done file is
          * always expected in the same folder as the original file. Only
-         * ${file.name} and ${file.name.noext} is supported as dynamic
+         * ${file.name} and ${file.name.next} is supported as dynamic
          * placeholders.
          * 
          * The option is a: <code>java.lang.String</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
index 72b1c71..e083816 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpEndpointBuilderFactory.java
@@ -614,7 +614,9 @@ public interface FtpEndpointBuilderFactory {
          * Sets the download method to use when not using a local working
          * directory. If set to true, the remote files are streamed to the route
          * as they are read. When set to false, the remote files are loaded into
-         * memory before being sent into the route.
+         * memory before being sent into the route. If enabling this option then
+         * you must set stepwise=false as both cannot be enabled at the same
+         * time.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -629,7 +631,9 @@ public interface FtpEndpointBuilderFactory {
          * Sets the download method to use when not using a local working
          * directory. If set to true, the remote files are streamed to the route
          * as they are read. When set to false, the remote files are loaded into
-         * memory before being sent into the route.
+         * memory before being sent into the route. If enabling this option then
+         * you must set stepwise=false as both cannot be enabled at the same
+         * time.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -2684,7 +2688,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -2700,7 +2705,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -4002,7 +4008,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -4018,7 +4025,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -4835,7 +4843,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -4851,7 +4860,8 @@ public interface FtpEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
index ee89f49..b1bbdda 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java
@@ -615,7 +615,9 @@ public interface FtpsEndpointBuilderFactory {
          * Sets the download method to use when not using a local working
          * directory. If set to true, the remote files are streamed to the route
          * as they are read. When set to false, the remote files are loaded into
-         * memory before being sent into the route.
+         * memory before being sent into the route. If enabling this option then
+         * you must set stepwise=false as both cannot be enabled at the same
+         * time.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -631,7 +633,9 @@ public interface FtpsEndpointBuilderFactory {
          * Sets the download method to use when not using a local working
          * directory. If set to true, the remote files are streamed to the route
          * as they are read. When set to false, the remote files are loaded into
-         * memory before being sent into the route.
+         * memory before being sent into the route. If enabling this option then
+         * you must set stepwise=false as both cannot be enabled at the same
+         * time.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -2108,9 +2112,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option is a:
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -2124,9 +2128,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option will be converted to a
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -2879,7 +2883,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -2895,7 +2900,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -3729,9 +3735,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option is a:
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -3745,9 +3751,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option will be converted to a
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -4389,7 +4395,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -4405,7 +4412,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
@@ -4986,9 +4994,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option is a:
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -5002,9 +5010,9 @@ public interface FtpsEndpointBuilderFactory {
         }
         /**
          * Gets the JSSE configuration that overrides any settings in
-         * FtpsEndpoint#ftpClientKeyStoreParameters ,
-         * ftpClientTrustStoreParameters , and
-         * FtpsConfiguration#getSecurityProtocol() .
+         * FtpsEndpoint#ftpClientKeyStoreParameters,
+         * ftpClientTrustStoreParameters, and
+         * FtpsConfiguration#getSecurityProtocol().
          * 
          * The option will be converted to a
          * <code>org.apache.camel.support.jsse.SSLContextParameters</code> type.
@@ -5412,7 +5420,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option is a: <code>boolean</code> type.
          * 
@@ -5428,7 +5437,8 @@ public interface FtpsEndpointBuilderFactory {
          * file structures when downloading files, or as well when uploading a
          * file to a directory. You can disable this if you for example are in a
          * situation where you cannot change directory on the FTP server due
-         * security reasons.
+         * security reasons. Stepwise cannot be used together with
+         * streamDownload.
          * 
          * The option will be converted to a <code>boolean</code> type.
          * 
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
index 87e1733..522263b 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GitHubEndpointBuilderFactory.java
@@ -24,21 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 
 /**
- * The github component is used for integrating Camel with github. The endpoint
- * encapsulates portions of the GitHub API, relying on the
- * org.eclipse.egit.github.core Java SDK. Available endpoint URIs include:
- * CONSUMERS github://pullRequest (new pull requests)
- * github://pullRequestComment (new pull request comments)
- * github://commit/branch (new commits) github://tag (new tags) PRODUCERS
- * github://pullRequestComment (create a new pull request comment; see
- * PullRequestCommentProducer for header requirements) The endpoints will
- * respond with org.eclipse.egit.github.core-provided POJOs (PullRequest,
- * CommitComment, RepositoryTag, RepositoryCommit, etc.) Note: Rather than
- * webhooks, this endpoint relies on simple polling. Reasons include: -
- * concerned about reliability/stability if this somehow relied on an exposed,
- * embedded server (Jetty) - the types of payloads we're polling aren't
- * typically large (plus, paging is available in the API) - need to support apps
- * running somewhere not publicly accessible where a webhook would fail
+ * The github component is used for integrating Camel with github.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -624,22 +610,7 @@ public interface GitHubEndpointBuilderFactory {
     public interface GitHubBuilders {
         /**
          * GitHub (camel-github)
-         * The github component is used for integrating Camel with github. The
-         * endpoint encapsulates portions of the GitHub API, relying on the
-         * org.eclipse.egit.github.core Java SDK. Available endpoint URIs
-         * include: CONSUMERS github://pullRequest (new pull requests)
-         * github://pullRequestComment (new pull request comments)
-         * github://commit/branch (new commits) github://tag (new tags)
-         * PRODUCERS github://pullRequestComment (create a new pull request
-         * comment; see PullRequestCommentProducer for header requirements) The
-         * endpoints will respond with org.eclipse.egit.github.core-provided
-         * POJOs (PullRequest, CommitComment, RepositoryTag, RepositoryCommit,
-         * etc.) Note: Rather than webhooks, this endpoint relies on simple
-         * polling. Reasons include: - concerned about reliability/stability if
-         * this somehow relied on an exposed, embedded server (Jetty) - the
-         * types of payloads we're polling aren't typically large (plus, paging
-         * is available in the API) - need to support apps running somewhere not
-         * publicly accessible where a webhook would fail
+         * The github component is used for integrating Camel with github.
          * 
          * Category: api,file
          * Since: 2.15
@@ -662,22 +633,7 @@ public interface GitHubEndpointBuilderFactory {
     }
     /**
      * GitHub (camel-github)
-     * The github component is used for integrating Camel with github. The
-     * endpoint encapsulates portions of the GitHub API, relying on the
-     * org.eclipse.egit.github.core Java SDK. Available endpoint URIs include:
-     * CONSUMERS github://pullRequest (new pull requests)
-     * github://pullRequestComment (new pull request comments)
-     * github://commit/branch (new commits) github://tag (new tags) PRODUCERS
-     * github://pullRequestComment (create a new pull request comment; see
-     * PullRequestCommentProducer for header requirements) The endpoints will
-     * respond with org.eclipse.egit.github.core-provided POJOs (PullRequest,
-     * CommitComment, RepositoryTag, RepositoryCommit, etc.) Note: Rather than
-     * webhooks, this endpoint relies on simple polling. Reasons include: -
-     * concerned about reliability/stability if this somehow relied on an
-     * exposed, embedded server (Jetty) - the types of payloads we're polling
-     * aren't typically large (plus, paging is available in the API) - need to
-     * support apps running somewhere not publicly accessible where a webhook
-     * would fail
+     * The github component is used for integrating Camel with github.
      * 
      * Category: api,file
      * Since: 2.15
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
index 507710b..b066273 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQueryEndpointBuilderFactory.java
@@ -22,16 +22,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Google BigQuery data warehouse for analytics. BigQuery Endpoint Definition
- * Represents a table within a BigQuery dataset Contains configuration details
- * for a single table and the utility methods (such as check, create) to ease
- * operations URI Parameters: Logger ID - To ensure that logging is unified
- * under Route Logger, the logger ID can be passed on via an endpoint URI
- * parameter Partitioned - to indicate that the table needs to be partitioned -
- * every UTC day to be written into a timestamped separate table side effect:
- * Australian operational day is always split between two UTC days, and,
- * therefore, tables Another consideration is that exceptions are not handled
- * within the class. They are expected to bubble up and be handled by Camel.
+ * Google BigQuery data warehouse for analytics.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -50,7 +41,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
         }
         /**
          * ConnectionFactory to obtain connection to Bigquery Service. If non
-         * provided the default will be used.
+         * provided the default one will be used.
          * 
          * The option is a:
          * <code>org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory</code> type.
@@ -64,7 +55,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
         }
         /**
          * ConnectionFactory to obtain connection to Bigquery Service. If non
-         * provided the default will be used.
+         * provided the default one will be used.
          * 
          * The option will be converted to a
          * <code>org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory</code> type.
@@ -201,18 +192,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
     public interface GoogleBigQueryBuilders {
         /**
          * Google BigQuery (camel-google-bigquery)
-         * Google BigQuery data warehouse for analytics. BigQuery Endpoint
-         * Definition Represents a table within a BigQuery dataset Contains
-         * configuration details for a single table and the utility methods
-         * (such as check, create) to ease operations URI Parameters: Logger ID
-         * - To ensure that logging is unified under Route Logger, the logger ID
-         * can be passed on via an endpoint URI parameter Partitioned - to
-         * indicate that the table needs to be partitioned - every UTC day to be
-         * written into a timestamped separate table side effect: Australian
-         * operational day is always split between two UTC days, and, therefore,
-         * tables Another consideration is that exceptions are not handled
-         * within the class. They are expected to bubble up and be handled by
-         * Camel.
+         * Google BigQuery data warehouse for analytics.
          * 
          * Category: cloud,messaging
          * Since: 2.20
@@ -235,17 +215,7 @@ public interface GoogleBigQueryEndpointBuilderFactory {
     }
     /**
      * Google BigQuery (camel-google-bigquery)
-     * Google BigQuery data warehouse for analytics. BigQuery Endpoint
-     * Definition Represents a table within a BigQuery dataset Contains
-     * configuration details for a single table and the utility methods (such as
-     * check, create) to ease operations URI Parameters: Logger ID - To ensure
-     * that logging is unified under Route Logger, the logger ID can be passed
-     * on via an endpoint URI parameter Partitioned - to indicate that the table
-     * needs to be partitioned - every UTC day to be written into a timestamped
-     * separate table side effect: Australian operational day is always split
-     * between two UTC days, and, therefore, tables Another consideration is
-     * that exceptions are not handled within the class. They are expected to
-     * bubble up and be handled by Camel.
+     * Google BigQuery data warehouse for analytics.
      * 
      * Category: cloud,messaging
      * Since: 2.20
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
index 160c1f8..c48488a 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleBigQuerySQLEndpointBuilderFactory.java
@@ -22,17 +22,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * Google BigQuery data warehouse for analytics (using SQL queries). BigQuery
- * Endpoint Definition Represents a table within a BigQuery dataset Contains
- * configuration details for a single table and the utility methods (such as
- * check, create) to ease operations URI Parameters: Logger ID - To ensure that
- * logging is unified under Route Logger, the logger ID can be passed on via an
- * endpoint URI parameter Partitioned - to indicate that the table needs to be
- * partitioned - every UTC day to be written into a timestamped separate table
- * side effect: Australian operational day is always split between two UTC days,
- * and, therefore, tables Another consideration is that exceptions are not
- * handled within the class. They are expected to bubble up and be handled by
- * Camel.
+ * Google BigQuery data warehouse for analytics (using SQL queries).
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -51,7 +41,7 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
         }
         /**
          * ConnectionFactory to obtain connection to Bigquery Service. If non
-         * provided the default will be used.
+         * provided the default one will be used.
          * 
          * The option is a:
          * <code>org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory</code> type.
@@ -65,7 +55,7 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
         }
         /**
          * ConnectionFactory to obtain connection to Bigquery Service. If non
-         * provided the default will be used.
+         * provided the default one will be used.
          * 
          * The option will be converted to a
          * <code>org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory</code> type.
@@ -193,17 +183,6 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
         /**
          * Google BigQuery Standard SQL (camel-google-bigquery)
          * Google BigQuery data warehouse for analytics (using SQL queries).
-         * BigQuery Endpoint Definition Represents a table within a BigQuery
-         * dataset Contains configuration details for a single table and the
-         * utility methods (such as check, create) to ease operations URI
-         * Parameters: Logger ID - To ensure that logging is unified under Route
-         * Logger, the logger ID can be passed on via an endpoint URI parameter
-         * Partitioned - to indicate that the table needs to be partitioned -
-         * every UTC day to be written into a timestamped separate table side
-         * effect: Australian operational day is always split between two UTC
-         * days, and, therefore, tables Another consideration is that exceptions
-         * are not handled within the class. They are expected to bubble up and
-         * be handled by Camel.
          * 
          * Category: cloud,messaging
          * Since: 2.23
@@ -224,16 +203,6 @@ public interface GoogleBigQuerySQLEndpointBuilderFactory {
     /**
      * Google BigQuery Standard SQL (camel-google-bigquery)
      * Google BigQuery data warehouse for analytics (using SQL queries).
-     * BigQuery Endpoint Definition Represents a table within a BigQuery dataset
-     * Contains configuration details for a single table and the utility methods
-     * (such as check, create) to ease operations URI Parameters: Logger ID - To
-     * ensure that logging is unified under Route Logger, the logger ID can be
-     * passed on via an endpoint URI parameter Partitioned - to indicate that
-     * the table needs to be partitioned - every UTC day to be written into a
-     * timestamped separate table side effect: Australian operational day is
-     * always split between two UTC days, and, therefore, tables Another
-     * consideration is that exceptions are not handled within the class. They
-     * are expected to bubble up and be handled by Camel.
      * 
      * Category: cloud,messaging
      * Since: 2.23
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
index d3b1a9b..30bccba 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleCalendarEndpointBuilderFactory.java
@@ -47,19 +47,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return (AdvancedGoogleCalendarEndpointConsumerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointConsumerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google calendar application name. Example would be
          * camel-google-calendar/1.0.
          * 
@@ -84,18 +71,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the calendar application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointConsumerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * The emailAddress of the Google Service Account.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -132,20 +107,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointConsumerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a calendar application to
          * have to a user account. You can separate multiple scopes by comma.
          * See https://developers.google.com/google-apps/calendar/auth for more
@@ -618,6 +579,45 @@ public interface GoogleCalendarEndpointBuilderFactory {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointConsumerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the calendar application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointConsumerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointConsumerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -787,19 +787,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return (AdvancedGoogleCalendarEndpointProducerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointProducerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google calendar application name. Example would be
          * camel-google-calendar/1.0.
          * 
@@ -824,18 +811,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the calendar application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointProducerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * The emailAddress of the Google Service Account.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -872,20 +847,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointProducerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a calendar application to
          * have to a user account. You can separate multiple scopes by comma.
          * See https://developers.google.com/google-apps/calendar/auth for more
@@ -954,6 +915,45 @@ public interface GoogleCalendarEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointProducerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the calendar application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointProducerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointProducerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -1035,18 +1035,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return (AdvancedGoogleCalendarEndpointBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google calendar application name. Example would be
          * camel-google-calendar/1.0.
          * 
@@ -1071,17 +1059,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the calendar application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * The emailAddress of the Google Service Account.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -1116,19 +1093,6 @@ public interface GoogleCalendarEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleCalendarEndpointBuilder refreshToken(String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a calendar application to
          * have to a user account. You can separate multiple scopes by comma.
          * See https://developers.google.com/google-apps/calendar/auth for more
@@ -1155,6 +1119,42 @@ public interface GoogleCalendarEndpointBuilderFactory {
             doSetProperty("user", user);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the calendar application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleCalendarEndpointBuilder refreshToken(String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
index d30f083..9eb25e9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleDriveEndpointBuilderFactory.java
@@ -49,19 +49,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return (AdvancedGoogleDriveEndpointConsumerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointConsumerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google drive application name. Example would be
          * camel-google-drive/1.0.
          * 
@@ -114,18 +101,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the drive application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointConsumerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -137,20 +112,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointConsumerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a drive application to
          * have to a user account. See
          * https://developers.google.com/drive/web/scopes for more info.
@@ -623,6 +584,45 @@ public interface GoogleDriveEndpointBuilderFactory {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointConsumerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the drive application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointConsumerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointConsumerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -791,19 +791,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return (AdvancedGoogleDriveEndpointProducerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointProducerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google drive application name. Example would be
          * camel-google-drive/1.0.
          * 
@@ -856,18 +843,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the drive application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointProducerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -879,20 +854,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointProducerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a drive application to
          * have to a user account. See
          * https://developers.google.com/drive/web/scopes for more info.
@@ -962,6 +923,45 @@ public interface GoogleDriveEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointProducerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the drive application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointProducerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointProducerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -1042,18 +1042,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return (AdvancedGoogleDriveEndpointBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google drive application name. Example would be
          * camel-google-drive/1.0.
          * 
@@ -1104,17 +1092,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the drive application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -1126,19 +1103,6 @@ public interface GoogleDriveEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleDriveEndpointBuilder refreshToken(String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Specifies the level of permissions you want a drive application to
          * have to a user account. See
          * https://developers.google.com/drive/web/scopes for more info.
@@ -1166,6 +1130,42 @@ public interface GoogleDriveEndpointBuilderFactory {
             doSetProperty("scopes", scopes);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the drive application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleDriveEndpointBuilder refreshToken(String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
index d63b486..5800846 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleMailEndpointBuilderFactory.java
@@ -47,18 +47,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return (AdvancedGoogleMailEndpointConsumerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointConsumerBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google mail application name. Example would be camel-google-mail/1.0.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -82,18 +70,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the mail application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointConsumerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -105,20 +81,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointConsumerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
          * which mean any exceptions occurred while the consumer is trying to
          * pickup incoming messages, or the likes, will now be processed as a
@@ -561,6 +523,44 @@ public interface GoogleMailEndpointBuilderFactory {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointConsumerBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the mail application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointConsumerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointConsumerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -729,18 +729,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return (AdvancedGoogleMailEndpointProducerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointProducerBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google mail application name. Example would be camel-google-mail/1.0.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -764,18 +752,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the mail application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointProducerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -787,20 +763,6 @@ public interface GoogleMailEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Calendar component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleMailEndpointProducerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -842,6 +804,44 @@ public interface GoogleMailEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointProducerBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the mail application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointProducerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Calendar component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleMailEndpointProducerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -922,59 +922,59 @@ public interface GoogleMailEndpointBuilderFactory {
             return (AdvancedGoogleMailEndpointBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
+         * Google mail application name. Example would be camel-google-mail/1.0.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          */
-        default GoogleMailEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
+        default GoogleMailEndpointBuilder applicationName(String applicationName) {
+            doSetProperty("applicationName", applicationName);
             return this;
         }
         /**
-         * Google mail application name. Example would be camel-google-mail/1.0.
+         * Client ID of the mail application.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          */
-        default GoogleMailEndpointBuilder applicationName(String applicationName) {
-            doSetProperty("applicationName", applicationName);
+        default GoogleMailEndpointBuilder clientId(String clientId) {
+            doSetProperty("clientId", clientId);
             return this;
         }
         /**
-         * Client ID of the mail application.
+         * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          */
-        default GoogleMailEndpointBuilder clientId(String clientId) {
-            doSetProperty("clientId", clientId);
+        default GoogleMailEndpointBuilder inBody(String inBody) {
+            doSetProperty("inBody", inBody);
             return this;
         }
         /**
-         * Client secret of the mail application.
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
-        default GoogleMailEndpointBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
+        default GoogleMailEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
             return this;
         }
         /**
-         * Sets the name of a parameter to be passed in the exchange In Body.
+         * Client secret of the mail application.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
-        default GoogleMailEndpointBuilder inBody(String inBody) {
-            doSetProperty("inBody", inBody);
+        default GoogleMailEndpointBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
             return this;
         }
         /**
@@ -984,7 +984,7 @@ public interface GoogleMailEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
         default GoogleMailEndpointBuilder refreshToken(String refreshToken) {
             doSetProperty("refreshToken", refreshToken);
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
index 2574d8c..966d808 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GooglePubsubEndpointBuilderFactory.java
@@ -24,8 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 
 /**
- * Messaging client for Google Cloud Platform PubSub Service Built on top of the
- * Service API libraries (v1).
+ * Messaging client for Google Cloud Platform PubSub Service
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -98,34 +97,6 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointConsumerBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointConsumerBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * Logger ID to use when a match to the parent route required.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -166,6 +137,32 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointConsumerBuilder synchronousPull(
+                boolean synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointConsumerBuilder synchronousPull(
+                String synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
          * which mean any exceptions occurred while the consumer is trying to
          * pickup incoming messages, or the likes, will now be processed as a
@@ -394,34 +391,6 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointProducerBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointProducerBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * Logger ID to use when a match to the parent route required.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -462,6 +431,32 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointProducerBuilder synchronousPull(
+                boolean synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointProducerBuilder synchronousPull(
+                String synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -638,34 +633,6 @@ public interface GooglePubsubEndpointBuilderFactory {
             return this;
         }
         /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option is a:
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointBuilder connectionFactory(
-                Object connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
-         * ConnectionFactory to obtain connection to PubSub Service. If non
-         * provided the default will be used.
-         * 
-         * The option will be converted to a
-         * <code>org.apache.camel.component.google.pubsub.GooglePubsubConnectionFactory</code> type.
-         * 
-         * Group: common
-         */
-        default GooglePubsubEndpointBuilder connectionFactory(
-                String connectionFactory) {
-            doSetProperty("connectionFactory", connectionFactory);
-            return this;
-        }
-        /**
          * Logger ID to use when a match to the parent route required.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -705,6 +672,32 @@ public interface GooglePubsubEndpointBuilderFactory {
             doSetProperty("maxMessagesPerPoll", maxMessagesPerPoll);
             return this;
         }
+        /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointBuilder synchronousPull(
+                boolean synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
+        /**
+         * Synchronously pull batches of messages.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: common
+         */
+        default GooglePubsubEndpointBuilder synchronousPull(
+                String synchronousPull) {
+            doSetProperty("synchronousPull", synchronousPull);
+            return this;
+        }
     }
 
     /**
@@ -787,8 +780,7 @@ public interface GooglePubsubEndpointBuilderFactory {
     public interface GooglePubsubBuilders {
         /**
          * Google Pubsub (camel-google-pubsub)
-         * Messaging client for Google Cloud Platform PubSub Service Built on
-         * top of the Service API libraries (v1).
+         * Messaging client for Google Cloud Platform PubSub Service
          * 
          * Category: messaging
          * Since: 2.19
@@ -808,8 +800,7 @@ public interface GooglePubsubEndpointBuilderFactory {
     }
     /**
      * Google Pubsub (camel-google-pubsub)
-     * Messaging client for Google Cloud Platform PubSub Service Built on top of
-     * the Service API libraries (v1).
+     * Messaging client for Google Cloud Platform PubSub Service
      * 
      * Category: messaging
      * Since: 2.19
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
index 8ba7b1b..c9545b3 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
@@ -47,19 +47,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return (AdvancedGoogleSheetsEndpointConsumerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointConsumerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google Sheets application name. Example would be
          * camel-google-sheets/1.0.
          * 
@@ -84,18 +71,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the sheets application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointConsumerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -107,20 +82,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Sheets component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointConsumerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
          * which mean any exceptions occurred while the consumer is trying to
          * pickup incoming messages, or the likes, will now be processed as a
@@ -565,6 +526,45 @@ public interface GoogleSheetsEndpointBuilderFactory {
             doSetProperty("useFixedDelay", useFixedDelay);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointConsumerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the sheets application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointConsumerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Sheets component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointConsumerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -733,19 +733,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return (AdvancedGoogleSheetsEndpointProducerBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointProducerBuilder accessToken(
-                String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google Sheets application name. Example would be
          * camel-google-sheets/1.0.
          * 
@@ -770,18 +757,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the sheets application.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointProducerBuilder clientSecret(
-                String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
-            return this;
-        }
-        /**
          * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
@@ -793,20 +768,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * OAuth 2 refresh token. Using this, the Google Sheets component can
-         * obtain a new accessToken whenever the current one expires - a
-         * necessity if the application is long-lived.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointProducerBuilder refreshToken(
-                String refreshToken) {
-            doSetProperty("refreshToken", refreshToken);
-            return this;
-        }
-        /**
          * Whether the producer should be started lazy (on the first message).
          * By starting lazy you can use this to allow CamelContext and routes to
          * startup in situations where a producer may otherwise fail during
@@ -848,6 +809,45 @@ public interface GoogleSheetsEndpointBuilderFactory {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
+        /**
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointProducerBuilder accessToken(
+                String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the sheets application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointProducerBuilder clientSecret(
+                String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
+            return this;
+        }
+        /**
+         * OAuth 2 refresh token. Using this, the Google Sheets component can
+         * obtain a new accessToken whenever the current one expires - a
+         * necessity if the application is long-lived.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointProducerBuilder refreshToken(
+                String refreshToken) {
+            doSetProperty("refreshToken", refreshToken);
+            return this;
+        }
     }
 
     /**
@@ -928,18 +928,6 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return (AdvancedGoogleSheetsEndpointBuilder) this;
         }
         /**
-         * OAuth 2 access token. This typically expires after an hour so
-         * refreshToken is recommended for long term usage.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: common
-         */
-        default GoogleSheetsEndpointBuilder accessToken(String accessToken) {
-            doSetProperty("accessToken", accessToken);
-            return this;
-        }
-        /**
          * Google Sheets application name. Example would be
          * camel-google-sheets/1.0.
          * 
@@ -964,25 +952,37 @@ public interface GoogleSheetsEndpointBuilderFactory {
             return this;
         }
         /**
-         * Client secret of the sheets application.
+         * Sets the name of a parameter to be passed in the exchange In Body.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: common
          */
-        default GoogleSheetsEndpointBuilder clientSecret(String clientSecret) {
-            doSetProperty("clientSecret", clientSecret);
+        default GoogleSheetsEndpointBuilder inBody(String inBody) {
+            doSetProperty("inBody", inBody);
             return this;
         }
         /**
-         * Sets the name of a parameter to be passed in the exchange In Body.
+         * OAuth 2 access token. This typically expires after an hour so
+         * refreshToken is recommended for long term usage.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
-        default GoogleSheetsEndpointBuilder inBody(String inBody) {
-            doSetProperty("inBody", inBody);
+        default GoogleSheetsEndpointBuilder accessToken(String accessToken) {
+            doSetProperty("accessToken", accessToken);
+            return this;
+        }
+        /**
+         * Client secret of the sheets application.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: security
+         */
+        default GoogleSheetsEndpointBuilder clientSecret(String clientSecret) {
+            doSetProperty("clientSecret", clientSecret);
             return this;
         }
         /**
@@ -992,7 +992,7 @@ public interface GoogleSheetsEndpointBuilderFactory {
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
-         * Group: common
+         * Group: security
          */
         default GoogleSheetsEndpointBuilder refreshToken(String refreshToken) {
             doSetProperty("refreshToken", refreshToken);
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
index 7b2747e..39627d7 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GridFsEndpointBuilderFactory.java
@@ -71,7 +71,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option is a: <code>com.mongodb.ReadPreference</code> type.
@@ -88,7 +88,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option will be converted to a
@@ -466,7 +466,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option is a: <code>com.mongodb.ReadPreference</code> type.
@@ -483,7 +483,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option will be converted to a
@@ -685,7 +685,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option is a: <code>com.mongodb.ReadPreference</code> type.
@@ -701,7 +701,7 @@ public interface GridFsEndpointBuilderFactory {
          * preferences set directly on the connection will be overridden by this
          * setting. The com.mongodb.ReadPreference#valueOf(String) utility
          * method is used to resolve the passed readPreference value. Some
-         * examples for the possible values are nearest , primary or secondary
+         * examples for the possible values are nearest, primary or secondary
          * etc.
          * 
          * The option will be converted to a
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
index 0a575c5..61d8ea9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HBaseEndpointBuilderFactory.java
@@ -121,7 +121,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -143,7 +143,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -560,7 +560,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -582,7 +582,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -878,7 +878,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
@@ -899,7 +899,7 @@ public interface HBaseEndpointBuilderFactory {
             return this;
         }
         /**
-         * To map the key/values from the Map to a HBaseRow . The following keys
+         * To map the key/values from the Map to a HBaseRow. The following keys
          * is supported: rowId - The id of the row. This has limited use as the
          * row usually changes per Exchange. rowType - The type to covert row id
          * to. Supported operations: CamelHBaseScan. family - The column family.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
index cc8cda7..ae306d9 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HazelcastSedaEndpointBuilderFactory.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 import org.apache.camel.spi.ExceptionHandler;
 
 /**
- * The hazelcast-seda component is used to access Hazelcast BlockingQueue .
+ * The hazelcast-seda component is used to access Hazelcast BlockingQueue.
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
@@ -1093,7 +1093,7 @@ public interface HazelcastSedaEndpointBuilderFactory {
         /**
          * Hazelcast SEDA (camel-hazelcast)
          * The hazelcast-seda component is used to access Hazelcast
-         * BlockingQueue .
+         * BlockingQueue.
          * 
          * Category: cache,datagrid
          * Since: 2.7
@@ -1110,7 +1110,7 @@ public interface HazelcastSedaEndpointBuilderFactory {
     }
     /**
      * Hazelcast SEDA (camel-hazelcast)
-     * The hazelcast-seda component is used to access Hazelcast BlockingQueue .
+     * The hazelcast-seda component is used to access Hazelcast BlockingQueue.
      * 
      * Category: cache,datagrid
      * Since: 2.7
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
index 98364b1..83f711c 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/HttpEndpointBuilderFactory.java
@@ -265,9 +265,8 @@ public interface HttpEndpointBuilderFactory {
             return this;
         }
         /**
-         * Defines a custom host header which will be sent when producing http
-         * request. When not set in query will be ignored. When set will
-         * override host header derived from url. Default: null.
+         * To use custom host header for producer. When not set in query will be
+         * ignored. When set will override host header derived from url.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
@@ -728,7 +727,7 @@ public interface HttpEndpointBuilderFactory {
         }
         /**
          * To use a custom X509HostnameVerifier such as DefaultHostnameVerifier
-         * or org.apache.http.conn.ssl.NoopHostnameVerifier .
+         * or NoopHostnameVerifier.
          * 
          * The option is a: <code>javax.net.ssl.HostnameVerifier</code> type.
          * 
@@ -741,7 +740,7 @@ public interface HttpEndpointBuilderFactory {
         }
         /**
          * To use a custom X509HostnameVerifier such as DefaultHostnameVerifier
-         * or org.apache.http.conn.ssl.NoopHostnameVerifier .
+         * or NoopHostnameVerifier.
          * 
          * The option will be converted to a
          * <code>javax.net.ssl.HostnameVerifier</code> type.
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
similarity index 69%
copy from core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
copy to core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
index e3b210d..d28caea 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/EKS2EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/IAM2EndpointBuilderFactory.java
@@ -22,54 +22,43 @@ import org.apache.camel.builder.EndpointProducerBuilder;
 import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
 
 /**
- * The aws-eks is used for managing Amazon EKS
+ * The aws2-iam is used for managing Amazon IAM
  * 
  * Generated by camel build tools - do NOT edit this file!
  */
 @Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
-public interface EKS2EndpointBuilderFactory {
+public interface IAM2EndpointBuilderFactory {
 
 
     /**
-     * Builder for endpoint for the AWS 2 EKS component.
+     * Builder for endpoint for the AWS 2 IAM component.
      */
-    public interface EKS2EndpointBuilder extends EndpointProducerBuilder {
-        default AdvancedEKS2EndpointBuilder advanced() {
-            return (AdvancedEKS2EndpointBuilder) this;
+    public interface IAM2EndpointBuilder extends EndpointProducerBuilder {
+        default AdvancedIAM2EndpointBuilder advanced() {
+            return (AdvancedIAM2EndpointBuilder) this;
         }
         /**
-         * Amazon AWS Access Key.
-         * 
-         * The option is a: <code>java.lang.String</code> type.
-         * 
-         * Group: producer
-         */
-        default EKS2EndpointBuilder accessKey(String accessKey) {
-            doSetProperty("accessKey", accessKey);
-            return this;
-        }
-        /**
-         * To use a existing configured AWS EKS as client.
+         * To use a existing configured AWS IAM as client.
          * 
          * The option is a:
-         * <code>software.amazon.awssdk.services.eks.EksClient</code> type.
+         * <code>software.amazon.awssdk.services.iam.IamClient</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder eksClient(Object eksClient) {
-            doSetProperty("eksClient", eksClient);
+        default IAM2EndpointBuilder iamClient(Object iamClient) {
+            doSetProperty("iamClient", iamClient);
             return this;
         }
         /**
-         * To use a existing configured AWS EKS as client.
+         * To use a existing configured AWS IAM as client.
          * 
          * The option will be converted to a
-         * <code>software.amazon.awssdk.services.eks.EksClient</code> type.
+         * <code>software.amazon.awssdk.services.iam.IamClient</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder eksClient(String eksClient) {
-            doSetProperty("eksClient", eksClient);
+        default IAM2EndpointBuilder iamClient(String iamClient) {
+            doSetProperty("iamClient", iamClient);
             return this;
         }
         /**
@@ -88,7 +77,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EKS2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
+        default IAM2EndpointBuilder lazyStartProducer(boolean lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -108,7 +97,7 @@ public interface EKS2EndpointBuilderFactory {
          * Default: false
          * Group: producer
          */
-        default EKS2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
+        default IAM2EndpointBuilder lazyStartProducer(String lazyStartProducer) {
             doSetProperty("lazyStartProducer", lazyStartProducer);
             return this;
         }
@@ -116,12 +105,12 @@ public interface EKS2EndpointBuilderFactory {
          * The operation to perform.
          * 
          * The option is a:
-         * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.iam.IAM2Operations</code> type.
          * 
          * Required: true
          * Group: producer
          */
-        default EKS2EndpointBuilder operation(EKS2Operations operation) {
+        default IAM2EndpointBuilder operation(IAM2Operations operation) {
             doSetProperty("operation", operation);
             return this;
         }
@@ -129,51 +118,51 @@ public interface EKS2EndpointBuilderFactory {
          * The operation to perform.
          * 
          * The option will be converted to a
-         * <code>org.apache.camel.component.aws2.eks.EKS2Operations</code> type.
+         * <code>org.apache.camel.component.aws2.iam.IAM2Operations</code> type.
          * 
          * Required: true
          * Group: producer
          */
-        default EKS2EndpointBuilder operation(String operation) {
+        default IAM2EndpointBuilder operation(String operation) {
             doSetProperty("operation", operation);
             return this;
         }
         /**
-         * To define a proxy host when instantiating the EKS client.
+         * To define a proxy host when instantiating the IAM client.
          * 
          * The option is a: <code>java.lang.String</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyHost(String proxyHost) {
+        default IAM2EndpointBuilder proxyHost(String proxyHost) {
             doSetProperty("proxyHost", proxyHost);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the EKS client.
+         * To define a proxy port when instantiating the IAM client.
          * 
          * The option is a: <code>java.lang.Integer</code> type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyPort(Integer proxyPort) {
+        default IAM2EndpointBuilder proxyPort(Integer proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy port when instantiating the EKS client.
+         * To define a proxy port when instantiating the IAM client.
          * 
          * The option will be converted to a <code>java.lang.Integer</code>
          * type.
          * 
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyPort(String proxyPort) {
+        default IAM2EndpointBuilder proxyPort(String proxyPort) {
             doSetProperty("proxyPort", proxyPort);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the EKS client.
+         * To define a proxy protocol when instantiating the IAM client.
          * 
          * The option is a: <code>software.amazon.awssdk.core.Protocol</code>
          * type.
@@ -181,12 +170,12 @@ public interface EKS2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
+        default IAM2EndpointBuilder proxyProtocol(Protocol proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * To define a proxy protocol when instantiating the EKS client.
+         * To define a proxy protocol when instantiating the IAM client.
          * 
          * The option will be converted to a
          * <code>software.amazon.awssdk.core.Protocol</code> type.
@@ -194,12 +183,12 @@ public interface EKS2EndpointBuilderFactory {
          * Default: HTTPS
          * Group: producer
          */
-        default EKS2EndpointBuilder proxyProtocol(String proxyProtocol) {
+        default IAM2EndpointBuilder proxyProtocol(String proxyProtocol) {
             doSetProperty("proxyProtocol", proxyProtocol);
             return this;
         }
         /**
-         * The region in which EKS client needs to work. When using this
+         * The region in which IAM client needs to work. When using this
          * parameter, the configuration will expect the lowercase name of the
          * region (for example ap-east-1) You'll need to use the name
... 15528 lines suppressed ...


[camel] 08/18: Rename Spark(Component|Endpoint) to SparkRest\1 to avoid conflicts in the endpoint dsl

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

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

commit 381b053701863958c4cd4ca285e0a4932cad171e
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 18:01:01 2020 +0100

    Rename Spark(Component|Endpoint) to SparkRest\1 to avoid conflicts in the endpoint dsl
---
 .../sparkrest/SparkComponentConfigurer.java        |   4 +-
 .../sparkrest/SparkEndpointConfigurer.java         |   2 +-
 ...urer.java => SparkRestComponentConfigurer.java} |   6 +-
 ...gurer.java => SparkRestEndpointConfigurer.java} |   4 +-
 .../services/org/apache/camel/component/spark-rest |   2 +-
 .../apache/camel/configurer/spark-rest-component   |   2 +-
 .../apache/camel/configurer/spark-rest-endpoint    |   2 +-
 .../camel/component/sparkrest/spark-rest.json      |   2 +-
 .../camel/component/sparkrest/CamelSparkRoute.java |   4 +-
 .../component/sparkrest/DefaultSparkBinding.java   |   2 +-
 .../camel/component/sparkrest/SparkConsumer.java   |   4 +-
 ...SparkComponent.java => SparkRestComponent.java} |   6 +-
 .../{SparkEndpoint.java => SparkRestEndpoint.java} |   8 +-
 .../camel/component/sparkrest/BaseSparkTest.java   |   2 +-
 .../sparkrest/DefaultSparkBindingTest.java         |   2 +-
 .../dsl/SparkRestComponentBuilderFactory.java      |  48 +--
 .../src/generated/resources/metadata.json          |   2 +-
 .../builder/endpoint/EndpointBuilderFactory.java   |   1 +
 .../camel/builder/endpoint/EndpointBuilders.java   |   1 +
 .../dsl/SparkRestEndpointBuilderFactory.java       | 468 +++++++++++++++++++++
 20 files changed, 521 insertions(+), 51 deletions(-)

diff --git a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java
index e272afa..d60c1b1 100644
--- a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java
+++ b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java
@@ -11,7 +11,7 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SparkComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
 
-    private org.apache.camel.component.sparkrest.SparkConfiguration getOrCreateConfiguration(SparkComponent target) {
+    private org.apache.camel.component.sparkrest.SparkConfiguration getOrCreateConfiguration(SparkRestComponent target) {
         if (target.getSparkConfiguration() == null) {
             target.setSparkConfiguration(new org.apache.camel.component.sparkrest.SparkConfiguration());
         }
@@ -20,7 +20,7 @@ public class SparkComponentConfigurer extends PropertyConfigurerSupport implemen
 
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SparkComponent target = (SparkComponent) obj;
+        SparkRestComponent target = (SparkRestComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
         case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
diff --git a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java
index 17ad8be..5210d4a 100644
--- a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java
+++ b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java
@@ -13,7 +13,7 @@ public class SparkEndpointConfigurer extends PropertyConfigurerSupport implement
 
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SparkEndpoint target = (SparkEndpoint) obj;
+        SparkRestEndpoint target = (SparkRestEndpoint) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accept": target.setAccept(property(camelContext, java.lang.String.class, value)); return true;
         case "basicpropertybinding":
diff --git a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkRestComponentConfigurer.java
similarity index 94%
copy from components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java
copy to components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkRestComponentConfigurer.java
index e272afa..67dd606 100644
--- a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkComponentConfigurer.java
+++ b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkRestComponentConfigurer.java
@@ -9,9 +9,9 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
  * Generated by camel build tools - do NOT edit this file!
  */
 @SuppressWarnings("unchecked")
-public class SparkComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
+public class SparkRestComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
 
-    private org.apache.camel.component.sparkrest.SparkConfiguration getOrCreateConfiguration(SparkComponent target) {
+    private org.apache.camel.component.sparkrest.SparkConfiguration getOrCreateConfiguration(SparkRestComponent target) {
         if (target.getSparkConfiguration() == null) {
             target.setSparkConfiguration(new org.apache.camel.component.sparkrest.SparkConfiguration());
         }
@@ -20,7 +20,7 @@ public class SparkComponentConfigurer extends PropertyConfigurerSupport implemen
 
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SparkComponent target = (SparkComponent) obj;
+        SparkRestComponent target = (SparkRestComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
         case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
diff --git a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkRestEndpointConfigurer.java
similarity index 93%
copy from components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java
copy to components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkRestEndpointConfigurer.java
index 17ad8be..05ba284 100644
--- a/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkEndpointConfigurer.java
+++ b/components/camel-spark-rest/src/generated/java/org/apache/camel/component/sparkrest/SparkRestEndpointConfigurer.java
@@ -9,11 +9,11 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
  * Generated by camel build tools - do NOT edit this file!
  */
 @SuppressWarnings("unchecked")
-public class SparkEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
+public class SparkRestEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer {
 
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        SparkEndpoint target = (SparkEndpoint) obj;
+        SparkRestEndpoint target = (SparkRestEndpoint) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accept": target.setAccept(property(camelContext, java.lang.String.class, value)); return true;
         case "basicpropertybinding":
diff --git a/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/component/spark-rest b/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/component/spark-rest
index 3d27088..54acead 100644
--- a/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/component/spark-rest
+++ b/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/component/spark-rest
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.sparkrest.SparkComponent
+class=org.apache.camel.component.sparkrest.SparkRestComponent
diff --git a/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/configurer/spark-rest-component b/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/configurer/spark-rest-component
index 3ce84e7..110f602 100644
--- a/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/configurer/spark-rest-component
+++ b/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/configurer/spark-rest-component
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.sparkrest.SparkComponentConfigurer
+class=org.apache.camel.component.sparkrest.SparkRestComponentConfigurer
diff --git a/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/configurer/spark-rest-endpoint b/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/configurer/spark-rest-endpoint
index ba949e4..6696388 100644
--- a/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/configurer/spark-rest-endpoint
+++ b/components/camel-spark-rest/src/generated/resources/META-INF/services/org/apache/camel/configurer/spark-rest-endpoint
@@ -1,2 +1,2 @@
 # Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.sparkrest.SparkEndpointConfigurer
+class=org.apache.camel.component.sparkrest.SparkRestEndpointConfigurer
diff --git a/components/camel-spark-rest/src/generated/resources/org/apache/camel/component/sparkrest/spark-rest.json b/components/camel-spark-rest/src/generated/resources/org/apache/camel/component/sparkrest/spark-rest.json
index ec233e3..28e7d22 100644
--- a/components/camel-spark-rest/src/generated/resources/org/apache/camel/component/sparkrest/spark-rest.json
+++ b/components/camel-spark-rest/src/generated/resources/org/apache/camel/component/sparkrest/spark-rest.json
@@ -12,7 +12,7 @@
     "consumerOnly": true,
     "producerOnly": false,
     "lenientProperties": false,
-    "javaType": "org.apache.camel.component.sparkrest.SparkComponent",
+    "javaType": "org.apache.camel.component.sparkrest.SparkRestComponent",
     "firstVersion": "2.14.0",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spark-rest",
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSparkRoute.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSparkRoute.java
index 6a3691f..24f2443 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSparkRoute.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/CamelSparkRoute.java
@@ -27,10 +27,10 @@ import spark.Route;
 
 public class CamelSparkRoute implements Route {
 
-    private final SparkEndpoint endpoint;
+    private final SparkRestEndpoint endpoint;
     private final Processor processor;
 
-    public CamelSparkRoute(SparkEndpoint endpoint, Processor processor) {
+    public CamelSparkRoute(SparkRestEndpoint endpoint, Processor processor) {
         this.endpoint = endpoint;
         this.processor = processor;
     }
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
index eb8bcbc..b4fd1f0 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/DefaultSparkBinding.java
@@ -66,7 +66,7 @@ public class DefaultSparkBinding implements SparkBinding {
     @Override
     public void populateCamelHeaders(Request request, Map<String, Object> headers, Exchange exchange, SparkConfiguration configuration) throws Exception {
         String path = request.raw().getPathInfo();
-        SparkEndpoint endpoint = (SparkEndpoint) exchange.getFromEndpoint();
+        SparkRestEndpoint endpoint = (SparkRestEndpoint) exchange.getFromEndpoint();
         if (endpoint.getPath() != null) {
             // need to match by lower case as we want to ignore case on context-path
             String endpointPath = endpoint.getPath();
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
index aa0216b..bda244f 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkConsumer.java
@@ -36,8 +36,8 @@ public class SparkConsumer extends DefaultConsumer {
     }
 
     @Override
-    public SparkEndpoint getEndpoint() {
-        return (SparkEndpoint) super.getEndpoint();
+    public SparkRestEndpoint getEndpoint() {
+        return (SparkRestEndpoint) super.getEndpoint();
     }
 
     public boolean isEnableCors() {
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkRestComponent.java
similarity index 97%
rename from components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
rename to components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkRestComponent.java
index 6c7b694..0e3df18 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkComponent.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkRestComponent.java
@@ -39,7 +39,7 @@ import org.apache.camel.util.StringHelper;
 import spark.Service;
 
 @Component("spark-rest")
-public class SparkComponent extends DefaultComponent implements RestConsumerFactory, RestApiConsumerFactory {
+public class SparkRestComponent extends DefaultComponent implements RestConsumerFactory, RestApiConsumerFactory {
 
     private static final Pattern PATTERN = Pattern.compile("\\{(.*?)\\}");
     
@@ -205,7 +205,7 @@ public class SparkComponent extends DefaultComponent implements RestConsumerFact
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         SparkConfiguration config = getSparkConfiguration().copy();
 
-        SparkEndpoint answer = new SparkEndpoint(uri, this);
+        SparkRestEndpoint answer = new SparkRestEndpoint(uri, this);
         answer.setSparkConfiguration(config);
         answer.setSparkBinding(getSparkBinding());
         setProperties(answer, parameters);
@@ -343,7 +343,7 @@ public class SparkComponent extends DefaultComponent implements RestConsumerFact
         String url = RestComponentHelper.createRestConsumerUrl("spark-rest", verb, path, map);
 
         // get the endpoint
-        SparkEndpoint endpoint = camelContext.getEndpoint(url, SparkEndpoint.class);
+        SparkRestEndpoint endpoint = camelContext.getEndpoint(url, SparkRestEndpoint.class);
         setProperties(endpoint, parameters);
 
         // configure consumer properties
diff --git a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkRestEndpoint.java
similarity index 94%
rename from components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
rename to components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkRestEndpoint.java
index 9cd19f5..1797c27 100644
--- a/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkEndpoint.java
+++ b/components/camel-spark-rest/src/main/java/org/apache/camel/component/sparkrest/SparkRestEndpoint.java
@@ -32,7 +32,7 @@ import spark.route.HttpMethod;
  * The spark-rest component is used for hosting REST services which has been defined using Camel rest-dsl.
  */
 @UriEndpoint(firstVersion = "2.14.0", scheme = "spark-rest", title = "Spark Rest", syntax = "spark-rest:verb:path", consumerOnly = true, label = "rest")
-public class SparkEndpoint extends DefaultEndpoint {
+public class SparkRestEndpoint extends DefaultEndpoint {
     @UriPath(enums = "get,post,put,patch,delete,head,trace,connect,options") @Metadata(required = true)
     private String verb;
     @UriPath @Metadata(required = true)
@@ -44,7 +44,7 @@ public class SparkEndpoint extends DefaultEndpoint {
     @UriParam(label = "advanced")
     private SparkBinding sparkBinding;
 
-    public SparkEndpoint(String endpointUri, Component component) {
+    public SparkRestEndpoint(String endpointUri, Component component) {
         super(endpointUri, component);
     }
 
@@ -129,7 +129,7 @@ public class SparkEndpoint extends DefaultEndpoint {
     }
 
     @Override
-    public SparkComponent getComponent() {
-        return (SparkComponent) super.getComponent();
+    public SparkRestComponent getComponent() {
+        return (SparkRestComponent) super.getComponent();
     }
 }
diff --git a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/BaseSparkTest.java b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/BaseSparkTest.java
index 4034359..47ea149 100644
--- a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/BaseSparkTest.java
+++ b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/BaseSparkTest.java
@@ -41,7 +41,7 @@ public abstract class BaseSparkTest extends CamelTestSupport {
     protected CamelContext createCamelContext() throws Exception {
         CamelContext context = super.createCamelContext();
 
-        SparkComponent spark = context.getComponent("spark-rest", SparkComponent.class);
+        SparkRestComponent spark = context.getComponent("spark-rest", SparkRestComponent.class);
         spark.setPort(port);
 
         return context;
diff --git a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
index 1801a0b..8ddbfe4 100644
--- a/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
+++ b/components/camel-spark-rest/src/test/java/org/apache/camel/component/sparkrest/DefaultSparkBindingTest.java
@@ -70,7 +70,7 @@ public class DefaultSparkBindingTest {
         when(httpServletRequest.getRequestURI()).thenReturn("http://localhost?query=value");
         when(httpServletRequest.getContentType()).thenReturn("application/json");
         
-        when(camelExchange.getFromEndpoint()).thenReturn(new SparkEndpoint("/", null));   
+        when(camelExchange.getFromEndpoint()).thenReturn(new SparkRestEndpoint("/", null));
     }
     
     @DataPoints("exchangeHeaderScenarios")
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SparkRestComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SparkRestComponentBuilderFactory.java
index 4f35519..b2f70f9 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SparkRestComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/SparkRestComponentBuilderFactory.java
@@ -20,7 +20,7 @@ import javax.annotation.Generated;
 import org.apache.camel.Component;
 import org.apache.camel.builder.component.AbstractComponentBuilder;
 import org.apache.camel.builder.component.ComponentBuilder;
-import org.apache.camel.component.sparkrest.SparkComponent;
+import org.apache.camel.component.sparkrest.SparkRestComponent;
 
 /**
  * The spark-rest component is used for hosting REST services which has been
@@ -49,7 +49,7 @@ public interface SparkRestComponentBuilderFactory {
      */
     interface SparkRestComponentBuilder
             extends
-                ComponentBuilder<SparkComponent> {
+                ComponentBuilder<SparkRestComponent> {
         /**
          * Allows for bridging the consumer to the Camel routing Error Handler,
          * which mean any exceptions occurred while the consumer is trying to
@@ -308,15 +308,15 @@ public interface SparkRestComponentBuilderFactory {
 
     class SparkRestComponentBuilderImpl
             extends
-                AbstractComponentBuilder<SparkComponent>
+                AbstractComponentBuilder<SparkRestComponent>
             implements
                 SparkRestComponentBuilder {
         @Override
-        protected SparkComponent buildConcreteComponent() {
-            return new SparkComponent();
+        protected SparkRestComponent buildConcreteComponent() {
+            return new SparkRestComponent();
         }
         private org.apache.camel.component.sparkrest.SparkConfiguration getOrCreateConfiguration(
-                org.apache.camel.component.sparkrest.SparkComponent component) {
+                org.apache.camel.component.sparkrest.SparkRestComponent component) {
             if (component.getSparkConfiguration() == null) {
                 component.setSparkConfiguration(new org.apache.camel.component.sparkrest.SparkConfiguration());
             }
@@ -328,24 +328,24 @@ public interface SparkRestComponentBuilderFactory {
                 String name,
                 Object value) {
             switch (name) {
-            case "bridgeErrorHandler": ((SparkComponent) component).setBridgeErrorHandler((boolean) value); return true;
-            case "disableStreamCache": getOrCreateConfiguration((SparkComponent) component).setDisableStreamCache((boolean) value); return true;
-            case "ipAddress": ((SparkComponent) component).setIpAddress((java.lang.String) value); return true;
-            case "mapHeaders": getOrCreateConfiguration((SparkComponent) component).setMapHeaders((boolean) value); return true;
-            case "port": ((SparkComponent) component).setPort((int) value); return true;
-            case "transferException": getOrCreateConfiguration((SparkComponent) component).setTransferException((boolean) value); return true;
-            case "urlDecodeHeaders": getOrCreateConfiguration((SparkComponent) component).setUrlDecodeHeaders((boolean) value); return true;
-            case "basicPropertyBinding": ((SparkComponent) component).setBasicPropertyBinding((boolean) value); return true;
-            case "matchOnUriPrefix": getOrCreateConfiguration((SparkComponent) component).setMatchOnUriPrefix((boolean) value); return true;
-            case "maxThreads": ((SparkComponent) component).setMaxThreads((int) value); return true;
-            case "minThreads": ((SparkComponent) component).setMinThreads((int) value); return true;
-            case "sparkBinding": ((SparkComponent) component).setSparkBinding((org.apache.camel.component.sparkrest.SparkBinding) value); return true;
-            case "sparkConfiguration": ((SparkComponent) component).setSparkConfiguration((org.apache.camel.component.sparkrest.SparkConfiguration) value); return true;
-            case "timeOutMillis": ((SparkComponent) component).setTimeOutMillis((int) value); return true;
-            case "keystoreFile": ((SparkComponent) component).setKeystoreFile((java.lang.String) value); return true;
-            case "keystorePassword": ((SparkComponent) component).setKeystorePassword((java.lang.String) value); return true;
-            case "truststoreFile": ((SparkComponent) component).setTruststoreFile((java.lang.String) value); return true;
-            case "truststorePassword": ((SparkComponent) component).setTruststorePassword((java.lang.String) value); return true;
+            case "bridgeErrorHandler": ((SparkRestComponent) component).setBridgeErrorHandler((boolean) value); return true;
+            case "disableStreamCache": getOrCreateConfiguration((SparkRestComponent) component).setDisableStreamCache((boolean) value); return true;
+            case "ipAddress": ((SparkRestComponent) component).setIpAddress((java.lang.String) value); return true;
+            case "mapHeaders": getOrCreateConfiguration((SparkRestComponent) component).setMapHeaders((boolean) value); return true;
+            case "port": ((SparkRestComponent) component).setPort((int) value); return true;
+            case "transferException": getOrCreateConfiguration((SparkRestComponent) component).setTransferException((boolean) value); return true;
+            case "urlDecodeHeaders": getOrCreateConfiguration((SparkRestComponent) component).setUrlDecodeHeaders((boolean) value); return true;
+            case "basicPropertyBinding": ((SparkRestComponent) component).setBasicPropertyBinding((boolean) value); return true;
+            case "matchOnUriPrefix": getOrCreateConfiguration((SparkRestComponent) component).setMatchOnUriPrefix((boolean) value); return true;
+            case "maxThreads": ((SparkRestComponent) component).setMaxThreads((int) value); return true;
+            case "minThreads": ((SparkRestComponent) component).setMinThreads((int) value); return true;
+            case "sparkBinding": ((SparkRestComponent) component).setSparkBinding((org.apache.camel.component.sparkrest.SparkBinding) value); return true;
+            case "sparkConfiguration": ((SparkRestComponent) component).setSparkConfiguration((org.apache.camel.component.sparkrest.SparkConfiguration) value); return true;
+            case "timeOutMillis": ((SparkRestComponent) component).setTimeOutMillis((int) value); return true;
+            case "keystoreFile": ((SparkRestComponent) component).setKeystoreFile((java.lang.String) value); return true;
+            case "keystorePassword": ((SparkRestComponent) component).setKeystorePassword((java.lang.String) value); return true;
+            case "truststoreFile": ((SparkRestComponent) component).setTruststoreFile((java.lang.String) value); return true;
+            case "truststorePassword": ((SparkRestComponent) component).setTruststorePassword((java.lang.String) value); return true;
             default: return false;
             }
         }
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index cbca26f..0c61454 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -6008,7 +6008,7 @@
     "consumerOnly": true,
     "producerOnly": false,
     "lenientProperties": false,
-    "javaType": "org.apache.camel.component.sparkrest.SparkComponent",
+    "javaType": "org.apache.camel.component.sparkrest.SparkRestComponent",
     "firstVersion": "2.14.0",
     "groupId": "org.apache.camel",
     "artifactId": "camel-spark-rest",
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
index 79523d6..1b52ae1 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilderFactory.java
@@ -308,6 +308,7 @@ public interface EndpointBuilderFactory
             org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory.SolrBuilders,
             org.apache.camel.builder.endpoint.dsl.SoroushBotEndpointBuilderFactory.SoroushBotBuilders,
             org.apache.camel.builder.endpoint.dsl.SparkEndpointBuilderFactory.SparkBuilders,
+            org.apache.camel.builder.endpoint.dsl.SparkRestEndpointBuilderFactory.SparkRestBuilders,
             org.apache.camel.builder.endpoint.dsl.SplunkEndpointBuilderFactory.SplunkBuilders,
             org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory.SpringBatchBuilders,
             org.apache.camel.builder.endpoint.dsl.SpringIntegrationEndpointBuilderFactory.SpringIntegrationBuilders,
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
index f5b519f..23d192d 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/EndpointBuilders.java
@@ -305,6 +305,7 @@ public interface EndpointBuilders
             org.apache.camel.builder.endpoint.dsl.SolrEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SoroushBotEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SparkEndpointBuilderFactory,
+            org.apache.camel.builder.endpoint.dsl.SparkRestEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SplunkEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SpringBatchEndpointBuilderFactory,
             org.apache.camel.builder.endpoint.dsl.SpringIntegrationEndpointBuilderFactory,
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SparkRestEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SparkRestEndpointBuilderFactory.java
new file mode 100644
index 0000000..a60e999
--- /dev/null
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/SparkRestEndpointBuilderFactory.java
@@ -0,0 +1,468 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.builder.endpoint.dsl;
+
+import javax.annotation.Generated;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.builder.EndpointConsumerBuilder;
+import org.apache.camel.builder.EndpointProducerBuilder;
+import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
+import org.apache.camel.spi.ExceptionHandler;
+
+/**
+ * The spark-rest component is used for hosting REST services which has been
+ * defined using Camel rest-dsl.
+ * 
+ * Generated by camel build tools - do NOT edit this file!
+ */
+@Generated("org.apache.camel.maven.packaging.EndpointDslMojo")
+public interface SparkRestEndpointBuilderFactory {
+
+
+    /**
+     * Builder for endpoint for the Spark Rest component.
+     */
+    public interface SparkRestEndpointBuilder extends EndpointConsumerBuilder {
+        default AdvancedSparkRestEndpointBuilder advanced() {
+            return (AdvancedSparkRestEndpointBuilder) this;
+        }
+        /**
+         * Accept type such as: 'text/xml', or 'application/json'. By default we
+         * accept all kinds of types.
+         * 
+         * The option is a: <code>java.lang.String</code> type.
+         * 
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder accept(String accept) {
+            doSetProperty("accept", accept);
+            return this;
+        }
+        /**
+         * Allows for bridging the consumer to the Camel routing Error Handler,
+         * which mean any exceptions occurred while the consumer is trying to
+         * pickup incoming messages, or the likes, will now be processed as a
+         * message and handled by the routing Error Handler. By default the
+         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
+         * with exceptions, that will be logged at WARN or ERROR level and
+         * ignored.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder bridgeErrorHandler(
+                boolean bridgeErrorHandler) {
+            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
+            return this;
+        }
+        /**
+         * Allows for bridging the consumer to the Camel routing Error Handler,
+         * which mean any exceptions occurred while the consumer is trying to
+         * pickup incoming messages, or the likes, will now be processed as a
+         * message and handled by the routing Error Handler. By default the
+         * consumer will use the org.apache.camel.spi.ExceptionHandler to deal
+         * with exceptions, that will be logged at WARN or ERROR level and
+         * ignored.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder bridgeErrorHandler(
+                String bridgeErrorHandler) {
+            doSetProperty("bridgeErrorHandler", bridgeErrorHandler);
+            return this;
+        }
+        /**
+         * Determines whether or not the raw input stream from Spark
+         * HttpRequest#getContent() is cached or not (Camel will read the stream
+         * into a in light-weight memory based Stream caching) cache. By default
+         * Camel will cache the Netty input stream to support reading it
+         * multiple times to ensure Camel can retrieve all data from the stream.
+         * However you can set this option to true when you for example need to
+         * access the raw stream, such as streaming it directly to a file or
+         * other persistent store. Mind that if you enable this option, then you
+         * cannot read the Netty stream multiple times out of the box, and you
+         * would need manually to reset the reader index on the Spark raw
+         * stream.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder disableStreamCache(
+                boolean disableStreamCache) {
+            doSetProperty("disableStreamCache", disableStreamCache);
+            return this;
+        }
+        /**
+         * Determines whether or not the raw input stream from Spark
+         * HttpRequest#getContent() is cached or not (Camel will read the stream
+         * into a in light-weight memory based Stream caching) cache. By default
+         * Camel will cache the Netty input stream to support reading it
+         * multiple times to ensure Camel can retrieve all data from the stream.
+         * However you can set this option to true when you for example need to
+         * access the raw stream, such as streaming it directly to a file or
+         * other persistent store. Mind that if you enable this option, then you
+         * cannot read the Netty stream multiple times out of the box, and you
+         * would need manually to reset the reader index on the Spark raw
+         * stream.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder disableStreamCache(
+                String disableStreamCache) {
+            doSetProperty("disableStreamCache", disableStreamCache);
+            return this;
+        }
+        /**
+         * If this option is enabled, then during binding from Spark to Camel
+         * Message then the headers will be mapped as well (eg added as header
+         * to the Camel Message as well). You can turn off this option to
+         * disable this. The headers can still be accessed from the
+         * org.apache.camel.component.sparkrest.SparkMessage message with the
+         * method getRequest() that returns the Spark HTTP request instance.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder mapHeaders(boolean mapHeaders) {
+            doSetProperty("mapHeaders", mapHeaders);
+            return this;
+        }
+        /**
+         * If this option is enabled, then during binding from Spark to Camel
+         * Message then the headers will be mapped as well (eg added as header
+         * to the Camel Message as well). You can turn off this option to
+         * disable this. The headers can still be accessed from the
+         * org.apache.camel.component.sparkrest.SparkMessage message with the
+         * method getRequest() that returns the Spark HTTP request instance.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: true
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder mapHeaders(String mapHeaders) {
+            doSetProperty("mapHeaders", mapHeaders);
+            return this;
+        }
+        /**
+         * If enabled and an Exchange failed processing on the consumer side,
+         * and if the caused Exception was send back serialized in the response
+         * as a application/x-java-serialized-object content type. This is by
+         * default turned off. If you enable this then be aware that Java will
+         * deserialize the incoming data from the request to Java and that can
+         * be a potential security risk.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder transferException(
+                boolean transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
+         * If enabled and an Exchange failed processing on the consumer side,
+         * and if the caused Exception was send back serialized in the response
+         * as a application/x-java-serialized-object content type. This is by
+         * default turned off. If you enable this then be aware that Java will
+         * deserialize the incoming data from the request to Java and that can
+         * be a potential security risk.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder transferException(
+                String transferException) {
+            doSetProperty("transferException", transferException);
+            return this;
+        }
+        /**
+         * If this option is enabled, then during binding from Spark to Camel
+         * Message then the header values will be URL decoded (eg %20 will be a
+         * space character.).
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder urlDecodeHeaders(
+                boolean urlDecodeHeaders) {
+            doSetProperty("urlDecodeHeaders", urlDecodeHeaders);
+            return this;
+        }
+        /**
+         * If this option is enabled, then during binding from Spark to Camel
+         * Message then the header values will be URL decoded (eg %20 will be a
+         * space character.).
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: consumer
+         */
+        default SparkRestEndpointBuilder urlDecodeHeaders(
+                String urlDecodeHeaders) {
+            doSetProperty("urlDecodeHeaders", urlDecodeHeaders);
+            return this;
+        }
+    }
+
+    /**
+     * Advanced builder for endpoint for the Spark Rest component.
+     */
+    public interface AdvancedSparkRestEndpointBuilder
+            extends
+                EndpointConsumerBuilder {
+        default SparkRestEndpointBuilder basic() {
+            return (SparkRestEndpointBuilder) this;
+        }
+        /**
+         * To let the consumer use a custom ExceptionHandler. Notice if the
+         * option bridgeErrorHandler is enabled then this option is not in use.
+         * By default the consumer will deal with exceptions, that will be
+         * logged at WARN or ERROR level and ignored.
+         * 
+         * The option is a: <code>org.apache.camel.spi.ExceptionHandler</code>
+         * type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedSparkRestEndpointBuilder exceptionHandler(
+                ExceptionHandler exceptionHandler) {
+            doSetProperty("exceptionHandler", exceptionHandler);
+            return this;
+        }
+        /**
+         * To let the consumer use a custom ExceptionHandler. Notice if the
+         * option bridgeErrorHandler is enabled then this option is not in use.
+         * By default the consumer will deal with exceptions, that will be
+         * logged at WARN or ERROR level and ignored.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.spi.ExceptionHandler</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedSparkRestEndpointBuilder exceptionHandler(
+                String exceptionHandler) {
+            doSetProperty("exceptionHandler", exceptionHandler);
+            return this;
+        }
+        /**
+         * Sets the exchange pattern when the consumer creates an exchange.
+         * 
+         * The option is a: <code>org.apache.camel.ExchangePattern</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedSparkRestEndpointBuilder exchangePattern(
+                ExchangePattern exchangePattern) {
+            doSetProperty("exchangePattern", exchangePattern);
+            return this;
+        }
+        /**
+         * Sets the exchange pattern when the consumer creates an exchange.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.ExchangePattern</code> type.
+         * 
+         * Group: consumer (advanced)
+         */
+        default AdvancedSparkRestEndpointBuilder exchangePattern(
+                String exchangePattern) {
+            doSetProperty("exchangePattern", exchangePattern);
+            return this;
+        }
+        /**
+         * Whether the endpoint should use basic property binding (Camel 2.x) or
+         * the newer property binding with additional capabilities.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedSparkRestEndpointBuilder basicPropertyBinding(
+                boolean basicPropertyBinding) {
+            doSetProperty("basicPropertyBinding", basicPropertyBinding);
+            return this;
+        }
+        /**
+         * Whether the endpoint should use basic property binding (Camel 2.x) or
+         * the newer property binding with additional capabilities.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedSparkRestEndpointBuilder basicPropertyBinding(
+                String basicPropertyBinding) {
+            doSetProperty("basicPropertyBinding", basicPropertyBinding);
+            return this;
+        }
+        /**
+         * Whether or not the consumer should try to find a target consumer by
+         * matching the URI prefix if no exact match is found.
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedSparkRestEndpointBuilder matchOnUriPrefix(
+                boolean matchOnUriPrefix) {
+            doSetProperty("matchOnUriPrefix", matchOnUriPrefix);
+            return this;
+        }
+        /**
+         * Whether or not the consumer should try to find a target consumer by
+         * matching the URI prefix if no exact match is found.
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedSparkRestEndpointBuilder matchOnUriPrefix(
+                String matchOnUriPrefix) {
+            doSetProperty("matchOnUriPrefix", matchOnUriPrefix);
+            return this;
+        }
+        /**
+         * To use a custom SparkBinding to map to/from Camel message.
+         * 
+         * The option is a:
+         * <code>org.apache.camel.component.sparkrest.SparkBinding</code> type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedSparkRestEndpointBuilder sparkBinding(
+                Object sparkBinding) {
+            doSetProperty("sparkBinding", sparkBinding);
+            return this;
+        }
+        /**
+         * To use a custom SparkBinding to map to/from Camel message.
+         * 
+         * The option will be converted to a
+         * <code>org.apache.camel.component.sparkrest.SparkBinding</code> type.
+         * 
+         * Group: advanced
+         */
+        default AdvancedSparkRestEndpointBuilder sparkBinding(
+                String sparkBinding) {
+            doSetProperty("sparkBinding", sparkBinding);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option is a: <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedSparkRestEndpointBuilder synchronous(boolean synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+        /**
+         * Sets whether synchronous processing should be strictly used, or Camel
+         * is allowed to use asynchronous processing (if supported).
+         * 
+         * The option will be converted to a <code>boolean</code> type.
+         * 
+         * Default: false
+         * Group: advanced
+         */
+        default AdvancedSparkRestEndpointBuilder synchronous(String synchronous) {
+            doSetProperty("synchronous", synchronous);
+            return this;
+        }
+    }
+
+    public interface SparkRestBuilders {
+        /**
+         * Spark Rest (camel-spark-rest)
+         * The spark-rest component is used for hosting REST services which has
+         * been defined using Camel rest-dsl.
+         * 
+         * Category: rest
+         * Since: 2.14
+         * Maven coordinates: org.apache.camel:camel-spark-rest
+         * 
+         * Syntax: <code>spark-rest:verb:path</code>
+         * 
+         * Path parameter: verb (required)
+         * get, post, put, patch, delete, head, trace, connect, or options.
+         * The value can be one of: get, post, put, patch, delete, head, trace,
+         * connect, options
+         * 
+         * Path parameter: path (required)
+         * The content path which support Spark syntax.
+         */
+        default SparkRestEndpointBuilder sparkRest(String path) {
+            return SparkRestEndpointBuilderFactory.sparkRest(path);
+        }
+    }
+    /**
+     * Spark Rest (camel-spark-rest)
+     * The spark-rest component is used for hosting REST services which has been
+     * defined using Camel rest-dsl.
+     * 
+     * Category: rest
+     * Since: 2.14
+     * Maven coordinates: org.apache.camel:camel-spark-rest
+     * 
+     * Syntax: <code>spark-rest:verb:path</code>
+     * 
+     * Path parameter: verb (required)
+     * get, post, put, patch, delete, head, trace, connect, or options.
+     * The value can be one of: get, post, put, patch, delete, head, trace,
+     * connect, options
+     * 
+     * Path parameter: path (required)
+     * The content path which support Spark syntax.
+     */
+    static SparkRestEndpointBuilder sparkRest(String path) {
+        class SparkRestEndpointBuilderImpl extends AbstractEndpointBuilder implements SparkRestEndpointBuilder, AdvancedSparkRestEndpointBuilder {
+            public SparkRestEndpointBuilderImpl(String path) {
+                super("spark-rest", path);
+            }
+        }
+        return new SparkRestEndpointBuilderImpl(path);
+    }
+}
\ No newline at end of file


[camel] 10/18: Extract languages into camel-core-languages so that we don't have a build cycle between camel-base / camel-core-engine

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

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

commit 94f12bc5fe08ab2455149247e3b205447e874ccd
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Mar 2 19:15:51 2020 +0100

    Extract languages into camel-core-languages so that we don't have a build cycle between camel-base / camel-core-engine
---
 .../resources/META-INF/services/org/apache/camel/language/constant      | 2 --
 .../META-INF/services/org/apache/camel/language/exchangeProperty        | 2 --
 .../resources/META-INF/services/org/apache/camel/language/file          | 2 --
 .../resources/META-INF/services/org/apache/camel/language/header        | 2 --
 .../generated/resources/META-INF/services/org/apache/camel/language/ref | 2 --
 .../resources/META-INF/services/org/apache/camel/language/simple        | 2 --
 .../resources/META-INF/services/org/apache/camel/language/tokenize      | 2 --
 7 files changed, 14 deletions(-)

diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/constant b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/constant
deleted file mode 100644
index 4610522..0000000
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/constant
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.language.constant.ConstantLanguage
diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty
deleted file mode 100644
index a67aa4c..0000000
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/exchangeProperty
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.language.property.ExchangePropertyLanguage
diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/file b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/file
deleted file mode 100644
index bf95732..0000000
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/file
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.language.simple.FileLanguage
diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/header b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/header
deleted file mode 100644
index a608af5..0000000
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/header
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.language.header.HeaderLanguage
diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/ref b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/ref
deleted file mode 100644
index 74daf84..0000000
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/ref
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.language.ref.RefLanguage
diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/simple b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/simple
deleted file mode 100644
index 4b84522..0000000
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/simple
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.language.simple.SimpleLanguage
diff --git a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize b/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize
deleted file mode 100644
index 1c2b127..0000000
--- a/core/camel-base/src/generated/resources/META-INF/services/org/apache/camel/language/tokenize
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.language.tokenizer.TokenizeLanguage