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/01/20 09:31:58 UTC

[camel-spring-boot] branch master updated (20d6b1b -> 2b2ec44)

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-spring-boot.git.


 discard 20d6b1b  [CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT
     new 28486be  [CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT
     new 2b2ec44  Regen

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

 * -- * -- B -- O -- O -- O   (20d6b1b)
            \
             N -- N -- N   refs/heads/master (2b2ec44)

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

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

The 2 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:
 .../springboot/catalog/components/activemq.json    |    2 +
 .../springboot/catalog/components/ahc-ws.json      |    5 +-
 .../springboot/catalog/components/ahc-wss.json     |    5 +-
 .../camel/springboot/catalog/components/ahc.json   |    5 +-
 .../camel/springboot/catalog/components/amqp.json  |    2 +
 .../camel/springboot/catalog/components/as2.json   |    2 +-
 .../catalog/components/atmosphere-websocket.json   |    1 -
 .../camel/springboot/catalog/components/atom.json  |    1 -
 .../catalog/components/atomix-multimap.json        |   37 +-
 .../springboot/catalog/components/aws-cw.json      |    3 +-
 .../springboot/catalog/components/aws-ddb.json     |    3 +-
 .../catalog/components/aws-ddbstream.json          |    1 -
 .../springboot/catalog/components/aws-ec2.json     |    3 +-
 .../springboot/catalog/components/aws-ecs.json     |    3 +-
 .../springboot/catalog/components/aws-eks.json     |    3 +-
 .../springboot/catalog/components/aws-iam.json     |    3 +-
 .../catalog/components/aws-kinesis-firehose.json   |    3 +-
 .../springboot/catalog/components/aws-kms.json     |    3 +-
 .../springboot/catalog/components/aws-lambda.json  |    7 +-
 .../springboot/catalog/components/aws-mq.json      |    3 +-
 .../springboot/catalog/components/aws-msk.json     |    3 +-
 .../springboot/catalog/components/aws-sdb.json     |    3 +-
 .../springboot/catalog/components/aws-ses.json     |    3 +-
 .../springboot/catalog/components/aws-sns.json     |    3 +-
 .../catalog/components/aws-translate.json          |    7 +-
 .../catalog/components/bean-validator.json         |    3 +-
 .../camel/springboot/catalog/components/bean.json  |   11 +-
 .../springboot/catalog/components/bonita.json      |   19 +-
 .../springboot/catalog/components/braintree.json   |    2 +
 .../catalog/components/caffeine-cache.json         |   12 +-
 .../catalog/components/caffeine-loadcache.json     |   12 +-
 .../springboot/catalog/components/chatscript.json  |    3 +-
 .../camel/springboot/catalog/components/chunk.json |    3 +-
 .../camel/springboot/catalog/components/class.json |   13 +-
 .../springboot/catalog/components/cm-sms.json      |    3 +-
 .../springboot/catalog/components/coap+tcp.json    |    1 +
 .../camel/springboot/catalog/components/coap.json  |    1 +
 .../springboot/catalog/components/coaps+tcp.json   |    1 +
 .../camel/springboot/catalog/components/coaps.json |    1 +
 .../springboot/catalog/components/consul.json      |   23 +-
 .../springboot/catalog/components/controlbus.json  |    3 +-
 .../camel/springboot/catalog/components/corda.json |   13 +-
 .../camel/springboot/catalog/components/cql.json   |    2 +-
 .../springboot/catalog/components/crypto-cms.json  |    5 +-
 .../springboot/catalog/components/crypto.json      |    3 +-
 .../camel/springboot/catalog/components/cxf.json   |    2 +-
 .../camel/springboot/catalog/components/cxfrs.json |    2 +-
 .../springboot/catalog/components/dataformat.json  |    3 +-
 .../catalog/components/dataset-test.json           |    3 +-
 .../springboot/catalog/components/dataset.json     |    3 +-
 .../catalog/components/debezium-mongodb.json       |    1 -
 .../catalog/components/debezium-mysql.json         |    1 -
 .../catalog/components/debezium-postgres.json      |    2 +-
 .../catalog/components/debezium-sqlserver.json     |    7 +-
 .../catalog/components/digitalocean.json           |    3 +-
 .../camel/springboot/catalog/components/dns.json   |    3 +-
 .../camel/springboot/catalog/components/dozer.json |    3 +-
 .../camel/springboot/catalog/components/drill.json |    3 +-
 .../springboot/catalog/components/ehcache.json     |    2 +-
 .../catalog/components/elasticsearch-rest.json     |    6 +-
 .../camel/springboot/catalog/components/elsql.json |    2 +-
 .../camel/springboot/catalog/components/exec.json  |    3 +-
 .../springboot/catalog/components/file-watch.json  |    1 -
 .../camel/springboot/catalog/components/flink.json |    3 +-
 .../camel/springboot/catalog/components/fop.json   |    3 +-
 .../springboot/catalog/components/freemarker.json  |    3 +-
 .../springboot/catalog/components/ganglia.json     |    5 +-
 .../springboot/catalog/components/geocoder.json    |    3 +-
 .../catalog/components/google-bigquery-sql.json    |    3 +-
 .../catalog/components/google-bigquery.json        |    3 +-
 .../catalog/components/google-calendar-stream.json |    1 -
 .../catalog/components/google-mail-stream.json     |    1 -
 .../catalog/components/google-sheets-stream.json   |    1 -
 .../springboot/catalog/components/graphql.json     |    3 +-
 .../catalog/components/hazelcast-atomicvalue.json  |    3 +-
 .../catalog/components/hazelcast-instance.json     |    1 -
 .../catalog/components/hazelcast-ringbuffer.json   |    3 +-
 .../catalog/components/hazelcast-set.json          |    2 +-
 .../camel/springboot/catalog/components/http.json  |    6 +-
 .../camel/springboot/catalog/components/https.json |    6 +-
 .../catalog/components/ignite-compute.json         |    3 +-
 .../catalog/components/ignite-events.json          |    1 -
 .../catalog/components/ignite-idgen.json           |    3 +-
 .../catalog/components/ignite-queue.json           |    3 +-
 .../springboot/catalog/components/ignite-set.json  |    3 +-
 .../springboot/catalog/components/influxdb.json    |    3 +-
 .../camel/springboot/catalog/components/iota.json  |    3 +-
 .../camel/springboot/catalog/components/ipfs.json  |   13 +-
 .../camel/springboot/catalog/components/irc.json   |    8 +-
 .../springboot/catalog/components/jcache.json      |    5 +-
 .../camel/springboot/catalog/components/jdbc.json  |    5 +-
 .../camel/springboot/catalog/components/jetty.json |    1 -
 .../camel/springboot/catalog/components/jing.json  |    3 +-
 .../camel/springboot/catalog/components/jira.json  |    2 +-
 .../camel/springboot/catalog/components/jms.json   |    2 +
 .../camel/springboot/catalog/components/jmx.json   |    1 -
 .../camel/springboot/catalog/components/jolt.json  |    3 +-
 .../catalog/components/json-validator.json         |    3 +-
 .../camel/springboot/catalog/components/jt400.json |   14 +-
 .../camel/springboot/catalog/components/kafka.json |    1 +
 .../catalog/components/kubernetes-config-maps.json |    3 +-
 .../kubernetes-persistent-volumes-claims.json      |    3 +-
 .../components/kubernetes-persistent-volumes.json  |    3 +-
 .../components/kubernetes-resources-quota.json     |    3 +-
 .../catalog/components/kubernetes-secrets.json     |    3 +-
 .../components/kubernetes-service-accounts.json    |    3 +-
 .../catalog/components/kubernetes-services.json    |    2 +-
 .../camel/springboot/catalog/components/kudu.json  |    3 +-
 .../springboot/catalog/components/language.json    |    3 +-
 .../camel/springboot/catalog/components/ldap.json  |    3 +-
 .../camel/springboot/catalog/components/ldif.json  |    3 +-
 .../camel/springboot/catalog/components/log.json   |    7 +-
 .../camel/springboot/catalog/components/lpr.json   |    3 +-
 .../springboot/catalog/components/lucene.json      |    3 +-
 .../springboot/catalog/components/lumberjack.json  |    1 -
 .../springboot/catalog/components/master.json      |    1 -
 .../springboot/catalog/components/metrics.json     |    3 +-
 .../springboot/catalog/components/micrometer.json  |    3 +-
 .../camel/springboot/catalog/components/mock.json  |    3 +-
 .../springboot/catalog/components/mongodb.json     |    6 +-
 .../camel/springboot/catalog/components/msv.json   |    3 +-
 .../springboot/catalog/components/mustache.json    |    3 +-
 .../camel/springboot/catalog/components/mvel.json  |    3 +-
 .../catalog/components/mybatis-bean.json           |    3 +-
 .../springboot/catalog/components/nagios.json      |    4 +-
 .../camel/springboot/catalog/components/nats.json  |   20 +-
 .../springboot/catalog/components/netty-http.json  |   10 +-
 .../camel/springboot/catalog/components/netty.json |    8 +-
 .../camel/springboot/catalog/components/nsq.json   |    7 +-
 .../components/openshift-build-configs.json        |    3 +-
 .../catalog/components/openshift-builds.json       |    3 +-
 .../catalog/components/openstack-cinder.json       |    3 +-
 .../catalog/components/openstack-glance.json       |    3 +-
 .../catalog/components/openstack-keystone.json     |    3 +-
 .../catalog/components/openstack-neutron.json      |    3 +-
 .../catalog/components/openstack-nova.json         |    3 +-
 .../catalog/components/openstack-swift.json        |    3 +-
 .../camel/springboot/catalog/components/pdf.json   |    3 +-
 .../catalog/components/pg-replication-slot.json    |    1 -
 .../catalog/components/platform-http.json          |    1 -
 .../springboot/catalog/components/quartz.json      |    4 +-
 .../springboot/catalog/components/rest-api.json    |    1 -
 .../catalog/components/rest-swagger.json           |    6 +-
 .../camel/springboot/catalog/components/rest.json  |    4 +-
 .../camel/springboot/catalog/components/rss.json   |    1 -
 .../camel/springboot/catalog/components/saga.json  |    3 +-
 .../springboot/catalog/components/salesforce.json  |    2 +-
 .../catalog/components/sap-netweaver.json          |    3 +-
 .../springboot/catalog/components/scheduler.json   |    1 -
 .../springboot/catalog/components/schematron.json  |    3 +-
 .../camel/springboot/catalog/components/scp.json   |    3 +-
 .../camel/springboot/catalog/components/seda.json  |    2 +
 .../springboot/catalog/components/service.json     |    1 -
 .../springboot/catalog/components/servicenow.json  |    3 +-
 .../springboot/catalog/components/servlet.json     |    1 -
 .../camel/springboot/catalog/components/sftp.json  |    4 +-
 .../springboot/catalog/components/sjms-batch.json  |    1 -
 .../camel/springboot/catalog/components/solr.json  |    3 +-
 .../springboot/catalog/components/solrCloud.json   |    3 +-
 .../camel/springboot/catalog/components/solrs.json |    3 +-
 .../springboot/catalog/components/soroush.json     |    4 +-
 .../camel/springboot/catalog/components/spark.json |    3 +-
 .../catalog/components/spring-batch.json           |    3 +-
 .../springboot/catalog/components/spring-ldap.json |    3 +-
 .../springboot/catalog/components/sql-stored.json  |    3 +-
 .../camel/springboot/catalog/components/stax.json  |    3 +-
 .../camel/springboot/catalog/components/stomp.json |    2 +
 .../catalog/components/string-template.json        |    3 +-
 .../camel/springboot/catalog/components/stub.json  |    2 +
 .../springboot/catalog/components/telegram.json    |    6 +
 .../camel/springboot/catalog/components/tika.json  |    3 +-
 .../camel/springboot/catalog/components/timer.json |    1 -
 .../springboot/catalog/components/undertow.json    |    2 +-
 .../springboot/catalog/components/validator.json   |    3 +-
 .../springboot/catalog/components/velocity.json    |    3 +-
 .../camel/springboot/catalog/components/vm.json    |    2 +
 .../camel/springboot/catalog/components/web3j.json |    6 +-
 .../springboot/catalog/components/webhook.json     |    1 -
 .../catalog/components/websocket-jsr356.json       |    8 +-
 .../springboot/catalog/components/wordpress.json   |    2 +-
 .../springboot/catalog/components/xchange.json     |    5 +-
 .../camel/springboot/catalog/components/xj.json    |    3 +-
 .../springboot/catalog/components/xmlsecurity.json |    3 +-
 .../springboot/catalog/components/xslt-saxon.json  |    3 +-
 .../camel/springboot/catalog/components/xslt.json  |    3 +-
 .../catalog/components/zookeeper-master.json       |    1 -
 .../catalog/others/spring-cloud-consul.json        |    2 +-
 .../catalog/others/spring-cloud-netflix.json       |    2 +-
 .../catalog/others/spring-cloud-zookeeper.json     |    2 +-
 .../springboot/catalog/others/spring-cloud.json    |    2 +-
 camel-spring-boot/pom.xml                          |   13 +
 .../springboot/ActiveMQComponentConfiguration.java |   32 +
 .../ahc/springboot/AhcComponentConfiguration.java  |   17 -
 .../ws/springboot/WsComponentConfiguration.java    |   17 -
 .../springboot/AMQPComponentConfiguration.java     |   32 +
 .../WebsocketComponentConfiguration.java           |   19 -
 .../springboot/AtomComponentConfiguration.java     |   19 -
 .../AtomixMultiMapComponentConfiguration.java      |   17 -
 .../cw/springboot/CwComponentConfiguration.java    |   17 -
 .../ddb/springboot/DdbComponentConfiguration.java  |   17 -
 .../DdbStreamComponentConfiguration.java           |   19 -
 .../ec2/springboot/EC2ComponentConfiguration.java  |   17 -
 .../ecs/springboot/ECSComponentConfiguration.java  |   17 -
 .../eks/springboot/EKSComponentConfiguration.java  |   17 -
 .../iam/springboot/IAMComponentConfiguration.java  |   17 -
 .../KinesisFirehoseComponentConfiguration.java     |   17 -
 .../kms/springboot/KMSComponentConfiguration.java  |   17 -
 .../springboot/LambdaComponentConfiguration.java   |   31 +-
 .../mq/springboot/MQComponentConfiguration.java    |   17 -
 .../msk/springboot/MSKComponentConfiguration.java  |   17 -
 .../sdb/springboot/SdbComponentConfiguration.java  |   17 -
 .../ses/springboot/SesComponentConfiguration.java  |   17 -
 .../sns/springboot/SnsComponentConfiguration.java  |   17 -
 .../TranslateComponentConfiguration.java           |   43 +-
 .../springboot/BeanComponentConfiguration.java     |   54 +-
 .../springboot/ClassComponentConfiguration.java    |   56 +-
 .../BeanValidatorComponentConfiguration.java       |   17 -
 .../springboot/BonitaComponentConfiguration.java   |   17 -
 .../BraintreeComponentConfiguration.java           |   29 +
 .../CaffeineCacheComponentConfiguration.java       |   17 -
 .../CaffeineLoadCacheComponentConfiguration.java   |   17 -
 .../CassandraComponentConfiguration.java           |    2 +-
 .../ChatScriptComponentConfiguration.java          |   17 -
 .../springboot/ChunkComponentConfiguration.java    |   17 -
 .../cm/springboot/CMComponentConfiguration.java    |   17 -
 .../springboot/ConsulComponentConfiguration.java   |   57 +-
 .../ControlBusComponentConfiguration.java          |   17 -
 components-starter/camel-corda-starter/pom.xml     |   12 -
 .../springboot/CordaComponentConfiguration.java    |   25 +-
 .../HystrixConfigurationDefinitionCommon.java      |  168 ++--
 .../CryptoCmsComponentConfiguration.java           |   17 -
 .../DigitalSignatureComponentConfiguration.java    |   17 -
 .../DataFormatComponentConfiguration.java          |   17 -
 .../springboot/DataSetComponentConfiguration.java  |   17 -
 .../DataSetTestComponentConfiguration.java         |   17 -
 .../DebeziumMongodbComponentConfiguration.java     |   19 -
 .../DebeziumMySqlComponentConfiguration.java       |   19 -
 .../DebeziumPostgresComponentConfiguration.java    |   34 +-
 .../DebeziumSqlserverComponentConfiguration.java   |   55 +-
 .../DigitalOceanComponentConfiguration.java        |   17 -
 .../dns/springboot/DnsComponentConfiguration.java  |   17 -
 .../springboot/DozerComponentConfiguration.java    |   17 -
 .../springboot/DrillComponentConfiguration.java    |   17 -
 .../springboot/EhcacheComponentConfiguration.java  |    9 +-
 .../ElasticsearchComponentConfiguration.java       |   17 -
 .../springboot/ExecComponentConfiguration.java     |   17 -
 .../FileWatchComponentConfiguration.java           |   19 -
 .../springboot/FlinkComponentConfiguration.java    |   17 -
 .../fop/springboot/FopComponentConfiguration.java  |   17 -
 .../FreemarkerComponentConfiguration.java          |   17 -
 .../springboot/GangliaComponentConfiguration.java  |   17 -
 .../springboot/GeoCoderComponentConfiguration.java |   17 -
 .../GoogleBigQueryComponentConfiguration.java      |   17 -
 .../GoogleBigQuerySQLComponentConfiguration.java   |   17 -
 ...GoogleCalendarStreamComponentConfiguration.java |   19 -
 .../GoogleMailStreamComponentConfiguration.java    |   19 -
 .../GoogleSheetsStreamComponentConfiguration.java  |   19 -
 .../springboot/GraphqlComponentConfiguration.java  |   17 -
 ...azelcastAtomicnumberComponentConfiguration.java |   17 -
 .../HazelcastInstanceComponentConfiguration.java   |   19 -
 .../HazelcastRingbufferComponentConfiguration.java |   17 -
 .../HazelcastSetComponentConfiguration.java        |    2 +-
 .../springboot/HttpComponentConfiguration.java     |   17 -
 .../IgniteComputeComponentConfiguration.java       |   17 -
 .../IgniteEventsComponentConfiguration.java        |   19 -
 .../IgniteIdGenComponentConfiguration.java         |   17 -
 .../IgniteQueueComponentConfiguration.java         |   17 -
 .../IgniteSetComponentConfiguration.java           |   17 -
 .../springboot/InfluxDbComponentConfiguration.java |   17 -
 .../springboot/IOTAComponentConfiguration.java     |   17 -
 .../springboot/IPFSComponentConfiguration.java     |   41 +-
 .../springboot/JCacheComponentConfiguration.java   |   25 +-
 .../springboot/JdbcComponentConfiguration.java     |   17 -
 .../JettyHttpComponentConfiguration9.java          |   19 -
 .../springboot/JingComponentConfiguration.java     |   17 -
 .../springboot/JiraComponentConfiguration.java     |    2 +-
 .../jms/springboot/JmsComponentConfiguration.java  |   32 +
 .../jmx/springboot/JMXComponentConfiguration.java  |   19 -
 .../springboot/JoltComponentConfiguration.java     |   17 -
 .../scp/springboot/ScpComponentConfiguration.java  |   17 -
 .../JsonValidatorComponentConfiguration.java       |   17 -
 .../springboot/KafkaComponentConfiguration.java    |   18 +
 ...KubernetesConfigMapsComponentConfiguration.java |   17 -
 ...tesPersistentVolumesComponentConfiguration.java |   17 -
 ...sistentVolumesClaimsComponentConfiguration.java |   17 -
 ...rnetesResourcesQuotaComponentConfiguration.java |   17 -
 .../KubernetesSecretsComponentConfiguration.java   |   17 -
 ...netesServiceAccountsComponentConfiguration.java |   17 -
 .../KubernetesServicesComponentConfiguration.java  |    4 +-
 ...penshiftBuildConfigsComponentConfiguration.java |   17 -
 .../OpenshiftBuildsComponentConfiguration.java     |   17 -
 .../springboot/KuduComponentConfiguration.java     |   17 -
 .../springboot/LanguageComponentConfiguration.java |   17 -
 .../springboot/LdapComponentConfiguration.java     |   17 -
 .../springboot/LdifComponentConfiguration.java     |   17 -
 .../log/springboot/LogComponentConfiguration.java  |   17 -
 .../springboot/LuceneComponentConfiguration.java   |   17 -
 .../LumberjackComponentConfiguration.java          |   19 -
 .../springboot/MasterComponentConfiguration.java   |   19 -
 .../springboot/MetricsComponentConfiguration.java  |   17 -
 .../MicrometerComponentConfiguration.java          |   17 -
 .../springboot/MockComponentConfiguration.java     |   17 -
 .../springboot/MongoDbComponentConfiguration.java  |    2 +-
 .../msv/springboot/MsvComponentConfiguration.java  |   17 -
 .../springboot/MustacheComponentConfiguration.java |   17 -
 .../springboot/MvelComponentConfiguration.java     |   17 -
 .../MyBatisBeanComponentConfiguration.java         |   17 -
 .../springboot/NagiosComponentConfiguration.java   |   35 -
 .../springboot/NatsComponentConfiguration.java     |   13 +
 .../NettyHttpComponentConfiguration.java           |   12 +-
 .../springboot/NettyComponentConfiguration.java    |   18 +-
 .../nsq/springboot/NsqComponentConfiguration.java  |   13 +
 .../springboot/CinderComponentConfiguration.java   |   17 -
 .../springboot/GlanceComponentConfiguration.java   |   17 -
 .../springboot/KeystoneComponentConfiguration.java |   17 -
 .../springboot/NeutronComponentConfiguration.java  |   17 -
 .../springboot/NovaComponentConfiguration.java     |   17 -
 .../springboot/SwiftComponentConfiguration.java    |   17 -
 .../pdf/springboot/PdfComponentConfiguration.java  |   17 -
 .../PgReplicationSlotComponentConfiguration.java   |   19 -
 .../PlatformHttpComponentConfiguration.java        |   19 -
 .../springboot/PrinterComponentConfiguration.java  |   17 -
 .../springboot/QuartzComponentConfiguration.java   |   42 +-
 .../springboot/RestApiComponentConfiguration.java  |   19 -
 .../camel-rest-swagger-starter/pom.xml             |    8 +
 .../RestSwaggerComponentConfiguration.java         |   17 -
 .../rss/springboot/RssComponentConfiguration.java  |   19 -
 .../springboot/SagaComponentConfiguration.java     |   17 -
 .../SalesforceComponentConfiguration.java          |    2 +-
 .../NetWeaverComponentConfiguration.java           |   17 -
 .../SchedulerComponentConfiguration.java           |   19 -
 .../SchematronComponentConfiguration.java          |   17 -
 .../springboot/SedaComponentConfiguration.java     |   15 +
 .../springboot/ServiceComponentConfiguration.java  |   19 -
 .../ServiceNowComponentConfiguration.java          |   17 -
 .../springboot/ServletComponentConfiguration.java  |   19 -
 .../SjmsBatchComponentConfiguration.java           |   19 -
 .../springboot/SolrComponentConfiguration.java     |   17 -
 .../springboot/SparkComponentConfiguration.java    |   17 -
 .../SpringBatchComponentConfiguration.java         |   17 -
 .../SpringLdapComponentConfiguration.java          |   17 -
 .../SqlStoredComponentConfiguration.java           |   17 -
 .../ssh/springboot/SshComponentConfiguration.java  |   14 -
 .../springboot/StAXComponentConfiguration.java     |   17 -
 .../springboot/StompComponentConfiguration.java    |   25 +
 .../StringTemplateComponentConfiguration.java      |   17 -
 .../springboot/StubComponentConfiguration.java     |   15 +
 .../springboot/TelegramComponentConfiguration.java |   40 +
 .../springboot/TikaComponentConfiguration.java     |   17 -
 .../springboot/TimerComponentConfiguration.java    |   19 -
 .../ValidatorComponentConfiguration.java           |   17 -
 .../springboot/VelocityComponentConfiguration.java |   17 -
 .../vm/springboot/VmComponentConfiguration.java    |   15 +
 .../springboot/Web3jComponentConfiguration.java    |   19 +-
 .../springboot/WebhookComponentConfiguration.java  |   19 -
 .../springboot/XChangeComponentConfiguration.java  |   17 -
 .../xj/springboot/XJComponentConfiguration.java    |   17 -
 .../XmlSignatureComponentConfiguration.java        |   17 -
 .../XsltSaxonComponentConfiguration.java           |   17 -
 .../springboot/XsltComponentConfiguration.java     |   17 -
 .../springboot/MasterComponentConfiguration.java   |   19 -
 tooling/camel-spring-boot-dependencies/pom.xml     | 1055 +++++++++++---------
 362 files changed, 1583 insertions(+), 3553 deletions(-)


[camel-spring-boot] 01/02: [CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT

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-spring-boot.git

commit 28486bea0558ae4aaefcac4279d4f15ae2891a80
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 20 10:23:12 2020 +0100

    [CAMEL-14410] Switch to camel 3.1.0-SNAPSHOT
---
 camel-spring-boot/pom.xml                          |  13 +
 pom.xml                                            |   2 +-
 .../pom.xml                                        |   5 +
 .../maven/AbstractSpringBootGenerator.java         |  11 +-
 .../maven/PrepareCatalogSpringBootMojo.java        |   2 -
 .../maven/SpringBootAutoConfigurationMojo.java     | 245 ++++++-------
 ...pdateSpringBootAutoConfigurationReadmeMojo.java | 402 +++++++++++++++++++++
 7 files changed, 542 insertions(+), 138 deletions(-)

diff --git a/camel-spring-boot/pom.xml b/camel-spring-boot/pom.xml
index 3087d69..e7401cd 100644
--- a/camel-spring-boot/pom.xml
+++ b/camel-spring-boot/pom.xml
@@ -172,6 +172,19 @@
                         </goals>
                         <phase>process-classes</phase>
                     </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.camel.springboot</groupId>
+                <artifactId>camel-spring-boot-generator-maven-plugin</artifactId>
+                <version>${project.version}</version>
+                <configuration>
+                    <!-- set to true to make build fail fast if missing documentation in docs files -->
+                    <failFast>true</failFast>
+                    <!-- set to true to make build fail if an option has no description -->
+                    <failOnMissingDescription>true</failOnMissingDescription>
+                </configuration>
+                <executions>
                     <execution>
                         <id>readme</id>
                         <goals>
diff --git a/pom.xml b/pom.xml
index c660115..d128e1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,7 +115,7 @@
         <spring-boot-version>2.2.3.RELEASE</spring-boot-version>
 
         <!-- Camel target version -->
-        <camel-version>3.0.0</camel-version>
+        <camel-version>3.1.0-SNAPSHOT</camel-version>
 
         <!-- versions -->
         <aether-version>1.0.2.v20150114</aether-version>
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
index 515ac25..f8e4c5a 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
+++ b/tooling/camel-spring-boot-generator-maven-plugin/pom.xml
@@ -54,6 +54,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.camel</groupId>
+            <artifactId>camel-tooling-util</artifactId>
+            <version>${camel-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
             <artifactId>bom-generator-maven-plugin</artifactId>
             <version>${camel-version}</version>
         </dependency>
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
index b9a2bc1..8b5524c 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/AbstractSpringBootGenerator.java
@@ -17,35 +17,28 @@
 package org.apache.camel.springboot.maven;
 
 import java.io.File;
-import java.io.FileFilter;
 import java.io.FileReader;
 import java.io.FileWriter;
 import java.io.IOError;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.function.Supplier;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 
+import org.apache.camel.tooling.util.PackageHelper;
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.artifact.Artifact;
 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;
-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 static org.apache.camel.maven.packaging.PackageHelper.loadText;
-
 public abstract class AbstractSpringBootGenerator extends AbstractMojo {
 
     /**
@@ -144,7 +137,7 @@ public abstract class AbstractSpringBootGenerator extends AbstractMojo {
 
     protected static String loadJson(JarFile jar, JarEntry je) {
         try (InputStream is = jar.getInputStream(je)) {
-            return loadText(is);
+            return PackageHelper.loadText(is);
         } catch (IOException e) {
             throw new IOError(e);
         }
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
index d8b9fb4..0889287 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/PrepareCatalogSpringBootMojo.java
@@ -37,8 +37,6 @@ import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.Parameter;
 import org.apache.maven.plugins.annotations.ResolutionScope;
 
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-
 /**
  * Prepares the Spring Boot provider camel catalog to include component it supports
  */
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
index fb4f3bd..4436bde 100644
--- a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/SpringBootAutoConfigurationMojo.java
@@ -45,7 +45,7 @@ import java.util.zip.ZipEntry;
 import javax.annotation.Generated;
 import javax.xml.bind.annotation.XmlTransient;
 
-import org.apache.camel.maven.packaging.JSonSchemaHelper;
+import org.apache.camel.maven.packaging.AbstractGeneratorMojo;
 import org.apache.camel.maven.packaging.model.ComponentModel;
 import org.apache.camel.maven.packaging.model.ComponentOptionModel;
 import org.apache.camel.maven.packaging.model.DataFormatModel;
@@ -55,14 +55,16 @@ import org.apache.camel.maven.packaging.model.LanguageModel;
 import org.apache.camel.maven.packaging.model.LanguageOptionModel;
 import org.apache.camel.maven.packaging.model.OtherModel;
 import org.apache.camel.maven.packaging.model.OtherOptionModel;
-import org.apache.camel.maven.packaging.srcgen.Annotation;
-import org.apache.camel.maven.packaging.srcgen.GenericType;
-import org.apache.camel.maven.packaging.srcgen.JavaClass;
-import org.apache.camel.maven.packaging.srcgen.Method;
-import org.apache.camel.maven.packaging.srcgen.Property;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriPath;
+import org.apache.camel.tooling.util.JSonSchemaHelper;
+import org.apache.camel.tooling.util.PackageHelper;
+import org.apache.camel.tooling.util.srcgen.Annotation;
+import org.apache.camel.tooling.util.srcgen.GenericType;
+import org.apache.camel.tooling.util.srcgen.JavaClass;
+import org.apache.camel.tooling.util.srcgen.Method;
+import org.apache.camel.tooling.util.srcgen.Property;
 import org.apache.commons.io.FileUtils;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -89,15 +91,6 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.context.annotation.Scope;
 
-import static org.apache.camel.maven.packaging.AbstractGeneratorMojo.updateResource;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getPropertyDefaultValue;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getPropertyDescriptionValue;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getPropertyJavaType;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getPropertyType;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.getSafeValue;
-import static org.apache.camel.maven.packaging.JSonSchemaHelper.parseJsonSchema;
-import static org.apache.camel.maven.packaging.PackageHelper.loadText;
-
 /**
  * Generate Spring Boot auto configuration files for Camel components and data
  * formats.
@@ -918,11 +911,11 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
                             }
 
                             if (optionName != null) {
-                                javaType = getPropertyJavaType(rows, optionName);
-                                type = getPropertyType(rows, optionName);
-                                defaultValue = getPropertyDefaultValue(rows, optionName);
+                                javaType = JSonSchemaHelper.getPropertyJavaType(rows, optionName);
+                                type = JSonSchemaHelper.getPropertyType(rows, optionName);
+                                defaultValue = JSonSchemaHelper.getPropertyDefaultValue(rows, optionName);
                                 // favour description from the model
-                                description = getPropertyDescriptionValue(rows, optionName);
+                                description = JSonSchemaHelper.getPropertyDescriptionValue(rows, optionName);
                                 if (description != null) {
                                     prop.getField().getJavaDoc().setFullText(description);
                                 }
@@ -1883,56 +1876,56 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("component", json, false);
 
         ComponentModel component = new ComponentModel();
-        component.setScheme(getSafeValue("scheme", rows));
-        component.setSyntax(getSafeValue("syntax", rows));
-        component.setAlternativeSyntax(getSafeValue("alternativeSyntax", rows));
-        component.setTitle(getSafeValue("title", rows));
-        component.setDescription(getSafeValue("description", rows));
+        component.setScheme(JSonSchemaHelper.getSafeValue("scheme", rows));
+        component.setSyntax(JSonSchemaHelper.getSafeValue("syntax", rows));
+        component.setAlternativeSyntax(JSonSchemaHelper.getSafeValue("alternativeSyntax", rows));
+        component.setTitle(JSonSchemaHelper.getSafeValue("title", rows));
+        component.setDescription(JSonSchemaHelper.getSafeValue("description", rows));
         component.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
-        component.setLabel(getSafeValue("label", rows));
-        component.setDeprecated(getSafeValue("deprecated", rows));
-        component.setDeprecationNote(getSafeValue("deprecationNote", rows));
-        component.setConsumerOnly(getSafeValue("consumerOnly", rows));
-        component.setProducerOnly(getSafeValue("producerOnly", rows));
-        component.setJavaType(getSafeValue("javaType", rows));
-        component.setGroupId(getSafeValue("groupId", rows));
-        component.setArtifactId(getSafeValue("artifactId", rows));
-        component.setVersion(getSafeValue("version", rows));
+        component.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
+        component.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+        component.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
+        component.setConsumerOnly(JSonSchemaHelper.getSafeValue("consumerOnly", rows));
+        component.setProducerOnly(JSonSchemaHelper.getSafeValue("producerOnly", rows));
+        component.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
+        component.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows));
+        component.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows));
+        component.setVersion(JSonSchemaHelper.getSafeValue("version", rows));
 
         rows = JSonSchemaHelper.parseJsonSchema("componentProperties", json, true);
         for (Map<String, String> row : rows) {
             ComponentOptionModel option = new ComponentOptionModel();
-            option.setName(getSafeValue("name", row));
-            option.setDisplayName(getSafeValue("displayName", row));
-            option.setKind(getSafeValue("kind", row));
-            option.setType(getSafeValue("type", row));
-            option.setJavaType(getSafeValue("javaType", row));
-            option.setDeprecated(getSafeValue("deprecated", row));
-            option.setDeprecationNote(getSafeValue("deprecationNote", row));
-            option.setDescription(getSafeValue("description", row));
-            option.setDefaultValue(getSafeValue("defaultValue", row));
-            option.setEnums(getSafeValue("enum", row));
+            option.setName(JSonSchemaHelper.getSafeValue("name", row));
+            option.setDisplayName(JSonSchemaHelper.getSafeValue("displayName", row));
+            option.setKind(JSonSchemaHelper.getSafeValue("kind", row));
+            option.setType(JSonSchemaHelper.getSafeValue("type", row));
+            option.setJavaType(JSonSchemaHelper.getSafeValue("javaType", row));
+            option.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", row));
+            option.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", row));
+            option.setDescription(JSonSchemaHelper.getSafeValue("description", row));
+            option.setDefaultValue(JSonSchemaHelper.getSafeValue("defaultValue", row));
+            option.setEnums(JSonSchemaHelper.getSafeValue("enum", row));
             component.addComponentOption(option);
         }
 
         rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
         for (Map<String, String> row : rows) {
             EndpointOptionModel option = new EndpointOptionModel();
-            option.setName(getSafeValue("name", row));
-            option.setDisplayName(getSafeValue("displayName", row));
-            option.setKind(getSafeValue("kind", row));
-            option.setGroup(getSafeValue("group", row));
-            option.setRequired(getSafeValue("required", row));
-            option.setType(getSafeValue("type", row));
-            option.setJavaType(getSafeValue("javaType", row));
-            option.setEnums(getSafeValue("enum", row));
-            option.setPrefix(getSafeValue("prefix", row));
-            option.setMultiValue(getSafeValue("multiValue", row));
-            option.setDeprecated(getSafeValue("deprecated", row));
-            option.setDeprecationNote(getSafeValue("deprecationNote", row));
-            option.setDefaultValue(getSafeValue("defaultValue", row));
-            option.setDescription(getSafeValue("description", row));
-            option.setEnumValues(getSafeValue("enum", row));
+            option.setName(JSonSchemaHelper.getSafeValue("name", row));
+            option.setDisplayName(JSonSchemaHelper.getSafeValue("displayName", row));
+            option.setKind(JSonSchemaHelper.getSafeValue("kind", row));
+            option.setGroup(JSonSchemaHelper.getSafeValue("group", row));
+            option.setRequired(JSonSchemaHelper.getSafeValue("required", row));
+            option.setType(JSonSchemaHelper.getSafeValue("type", row));
+            option.setJavaType(JSonSchemaHelper.getSafeValue("javaType", row));
+            option.setEnums(JSonSchemaHelper.getSafeValue("enum", row));
+            option.setPrefix(JSonSchemaHelper.getSafeValue("prefix", row));
+            option.setMultiValue(JSonSchemaHelper.getSafeValue("multiValue", row));
+            option.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", row));
+            option.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", row));
+            option.setDefaultValue(JSonSchemaHelper.getSafeValue("defaultValue", row));
+            option.setDescription(JSonSchemaHelper.getSafeValue("description", row));
+            option.setEnumValues(JSonSchemaHelper.getSafeValue("enum", row));
             component.addEndpointOption(option);
         }
 
@@ -1943,32 +1936,32 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("dataformat", json, false);
 
         DataFormatModel dataFormat = new DataFormatModel();
-        dataFormat.setTitle(getSafeValue("title", rows));
-        dataFormat.setName(getSafeValue("name", rows));
-        dataFormat.setModelName(getSafeValue("modelName", rows));
-        dataFormat.setDescription(getSafeValue("description", rows));
+        dataFormat.setTitle(JSonSchemaHelper.getSafeValue("title", rows));
+        dataFormat.setName(JSonSchemaHelper.getSafeValue("name", rows));
+        dataFormat.setModelName(JSonSchemaHelper.getSafeValue("modelName", rows));
+        dataFormat.setDescription(JSonSchemaHelper.getSafeValue("description", rows));
         dataFormat.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
-        dataFormat.setLabel(getSafeValue("label", rows));
-        dataFormat.setDeprecated(getSafeValue("deprecated", rows));
-        dataFormat.setDeprecationNote(getSafeValue("deprecationNote", rows));
-        dataFormat.setJavaType(getSafeValue("javaType", rows));
-        dataFormat.setGroupId(getSafeValue("groupId", rows));
-        dataFormat.setArtifactId(getSafeValue("artifactId", rows));
-        dataFormat.setVersion(getSafeValue("version", rows));
+        dataFormat.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
+        dataFormat.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+        dataFormat.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
+        dataFormat.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
+        dataFormat.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows));
+        dataFormat.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows));
+        dataFormat.setVersion(JSonSchemaHelper.getSafeValue("version", rows));
 
         rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
         for (Map<String, String> row : rows) {
             DataFormatOptionModel option = new DataFormatOptionModel();
-            option.setName(getSafeValue("name", row));
-            option.setDisplayName(getSafeValue("displayName", row));
-            option.setKind(getSafeValue("kind", row));
-            option.setType(getSafeValue("type", row));
-            option.setJavaType(getSafeValue("javaType", row));
-            option.setDeprecated(getSafeValue("deprecated", row));
-            option.setDeprecationNote(getSafeValue("deprecationNote", row));
-            option.setDescription(getSafeValue("description", row));
-            option.setDefaultValue(getSafeValue("defaultValue", row));
-            option.setEnumValues(getSafeValue("enum", row));
+            option.setName(JSonSchemaHelper.getSafeValue("name", row));
+            option.setDisplayName(JSonSchemaHelper.getSafeValue("displayName", row));
+            option.setKind(JSonSchemaHelper.getSafeValue("kind", row));
+            option.setType(JSonSchemaHelper.getSafeValue("type", row));
+            option.setJavaType(JSonSchemaHelper.getSafeValue("javaType", row));
+            option.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", row));
+            option.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", row));
+            option.setDescription(JSonSchemaHelper.getSafeValue("description", row));
+            option.setDefaultValue(JSonSchemaHelper.getSafeValue("defaultValue", row));
+            option.setEnumValues(JSonSchemaHelper.getSafeValue("enum", row));
             dataFormat.addDataFormatOption(option);
         }
 
@@ -1979,32 +1972,32 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("language", json, false);
 
         LanguageModel language = new LanguageModel();
-        language.setTitle(getSafeValue("title", rows));
-        language.setName(getSafeValue("name", rows));
-        language.setModelName(getSafeValue("modelName", rows));
-        language.setDescription(getSafeValue("description", rows));
+        language.setTitle(JSonSchemaHelper.getSafeValue("title", rows));
+        language.setName(JSonSchemaHelper.getSafeValue("name", rows));
+        language.setModelName(JSonSchemaHelper.getSafeValue("modelName", rows));
+        language.setDescription(JSonSchemaHelper.getSafeValue("description", rows));
         language.setFirstVersion(JSonSchemaHelper.getSafeValue("firstVersion", rows));
-        language.setLabel(getSafeValue("label", rows));
-        language.setDeprecated(getSafeValue("deprecated", rows));
-        language.setDeprecationNote(getSafeValue("deprecationNote", rows));
-        language.setJavaType(getSafeValue("javaType", rows));
-        language.setGroupId(getSafeValue("groupId", rows));
-        language.setArtifactId(getSafeValue("artifactId", rows));
-        language.setVersion(getSafeValue("version", rows));
+        language.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
+        language.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+        language.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
+        language.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
+        language.setGroupId(JSonSchemaHelper.getSafeValue("groupId", rows));
+        language.setArtifactId(JSonSchemaHelper.getSafeValue("artifactId", rows));
+        language.setVersion(JSonSchemaHelper.getSafeValue("version", rows));
 
         rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
         for (Map<String, String> row : rows) {
             LanguageOptionModel option = new LanguageOptionModel();
-            option.setName(getSafeValue("name", row));
-            option.setDisplayName(getSafeValue("displayName", row));
-            option.setKind(getSafeValue("kind", row));
-            option.setType(getSafeValue("type", row));
-            option.setJavaType(getSafeValue("javaType", row));
-            option.setDeprecated(getSafeValue("deprecated", row));
-            option.setDeprecationNote(getSafeValue("deprecationNote", row));
-            option.setDescription(getSafeValue("description", row));
-            option.setDefaultValue(getSafeValue("defaultValue", row));
-            option.setEnumValues(getSafeValue("enum", row));
+            option.setName(JSonSchemaHelper.getSafeValue("name", row));
+            option.setDisplayName(JSonSchemaHelper.getSafeValue("displayName", row));
+            option.setKind(JSonSchemaHelper.getSafeValue("kind", row));
+            option.setType(JSonSchemaHelper.getSafeValue("type", row));
+            option.setJavaType(JSonSchemaHelper.getSafeValue("javaType", row));
+            option.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", row));
+            option.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", row));
+            option.setDescription(JSonSchemaHelper.getSafeValue("description", row));
+            option.setDefaultValue(JSonSchemaHelper.getSafeValue("defaultValue", row));
+            option.setEnumValues(JSonSchemaHelper.getSafeValue("enum", row));
             language.addLanguageOption(option);
         }
 
@@ -2012,33 +2005,33 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
     }
 
     private OtherModel generateOtherModel(String json) {
-        List<Map<String, String>> rows = parseJsonSchema("model", json, false);
+        List<Map<String, String>> rows = JSonSchemaHelper.parseJsonSchema("model", json, false);
 
         OtherModel model = new OtherModel();
-        model.setName(getSafeValue("name", rows));
-        model.setTitle(getSafeValue("title", rows));
-        model.setDescription(getSafeValue("description", rows));
-        model.setJavaType(getSafeValue("javaType", rows));
-        model.setLabel(getSafeValue("label", rows));
-        model.setDeprecated(getSafeValue("deprecated", rows));
-        model.setDeprecationNote(getSafeValue("deprecationNote", rows));
-
-        rows = parseJsonSchema("properties", json, true);
+        model.setName(JSonSchemaHelper.getSafeValue("name", rows));
+        model.setTitle(JSonSchemaHelper.getSafeValue("title", rows));
+        model.setDescription(JSonSchemaHelper.getSafeValue("description", rows));
+        model.setJavaType(JSonSchemaHelper.getSafeValue("javaType", rows));
+        model.setLabel(JSonSchemaHelper.getSafeValue("label", rows));
+        model.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", rows));
+        model.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", rows));
+
+        rows = JSonSchemaHelper.parseJsonSchema("properties", json, true);
         for (Map<String, String> row : rows) {
             OtherOptionModel option = new OtherOptionModel();
-            option.setName(getSafeValue("name", row));
-            option.setDisplayName(getSafeValue("displayName", row));
-            option.setKind(getSafeValue("kind", row));
-            option.setGroup(getSafeValue("group", row));
-            option.setRequired(getSafeValue("required", row));
-            option.setType(getSafeValue("type", row));
-            option.setJavaType(getSafeValue("javaType", row));
-            option.setEnums(getSafeValue("enum", row));
-            option.setDeprecated(getSafeValue("deprecated", row));
-            option.setDeprecationNote(getSafeValue("deprecationNote", row));
-            option.setDefaultValue(getSafeValue("defaultValue", row));
-            option.setDescription(getSafeValue("description", row));
-            option.setEnums(getSafeValue("enums", row));
+            option.setName(JSonSchemaHelper.getSafeValue("name", row));
+            option.setDisplayName(JSonSchemaHelper.getSafeValue("displayName", row));
+            option.setKind(JSonSchemaHelper.getSafeValue("kind", row));
+            option.setGroup(JSonSchemaHelper.getSafeValue("group", row));
+            option.setRequired(JSonSchemaHelper.getSafeValue("required", row));
+            option.setType(JSonSchemaHelper.getSafeValue("type", row));
+            option.setJavaType(JSonSchemaHelper.getSafeValue("javaType", row));
+            option.setEnums(JSonSchemaHelper.getSafeValue("enum", row));
+            option.setDeprecated(JSonSchemaHelper.getSafeValue("deprecated", row));
+            option.setDeprecationNote(JSonSchemaHelper.getSafeValue("deprecationNote", row));
+            option.setDefaultValue(JSonSchemaHelper.getSafeValue("defaultValue", row));
+            option.setDescription(JSonSchemaHelper.getSafeValue("description", row));
+            option.setEnums(JSonSchemaHelper.getSafeValue("enums", row));
 
             model.addOptionModel(option);
         }
@@ -2089,12 +2082,12 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
         try {
             String header;
             try (InputStream is = getClass().getClassLoader().getResourceAsStream("license-header-java.txt")) {
-                header = loadText(is);
+                header = PackageHelper.loadText(is);
             }
             String code = header + source;
             getLog().debug("Source code generated:\n" + code);
 
-            updateResource(null, target.toPath(), code);
+            AbstractGeneratorMojo.updateResource(null, target.toPath(), code);
         } catch (Exception e) {
             throw new MojoFailureException("IOError with file " + target, e);
         }
@@ -2158,7 +2151,7 @@ public class SpringBootAutoConfigurationMojo extends AbstractSpringBootGenerator
             // create new file
             try {
                 InputStream is = getClass().getClassLoader().getResourceAsStream("license-header.txt");
-                String header = loadText(is);
+                String header = PackageHelper.loadText(is);
                 String code = sb.toString();
                 // add empty new line after header
                 code = header + "\n" + code;
diff --git a/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateSpringBootAutoConfigurationReadmeMojo.java b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateSpringBootAutoConfigurationReadmeMojo.java
new file mode 100644
index 0000000..19c545c
--- /dev/null
+++ b/tooling/camel-spring-boot-generator-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateSpringBootAutoConfigurationReadmeMojo.java
@@ -0,0 +1,402 @@
+/*
+ * 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.springboot.maven;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.stream.Collectors;
+
+import org.apache.camel.maven.packaging.MvelHelper;
+import org.apache.camel.maven.packaging.model.SpringBootAutoConfigureOptionModel;
+import org.apache.camel.maven.packaging.model.SpringBootModel;
+import org.apache.camel.tooling.util.Strings;
+import org.apache.camel.util.json.DeserializationException;
+import org.apache.camel.util.json.JsonArray;
+import org.apache.camel.util.json.JsonObject;
+import org.apache.camel.util.json.Jsoner;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugins.annotations.Component;
+import org.apache.maven.plugins.annotations.Mojo;
+import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.project.MavenProject;
+import org.mvel2.templates.TemplateRuntime;
+import org.sonatype.plexus.build.incremental.BuildContext;
+
+import static org.apache.camel.tooling.util.PackageHelper.loadText;
+import static org.apache.camel.tooling.util.PackageHelper.writeText;
+
+/**
+ * For all the Camel components that has Spring Boot starter JAR, their documentation
+ * .adoc files in their component directory is updated to include spring boot auto configuration options.
+ */
+@Mojo(name = "update-spring-boot-auto-configuration-readme", threadSafe = true)
+public class UpdateSpringBootAutoConfigurationReadmeMojo extends AbstractMojo {
+
+    /**
+     * The maven project.
+     */
+    @Parameter(property = "project", required = true, readonly = true)
+    protected MavenProject project;
+
+    /**
+     * The project build directory
+     *
+     */
+    @Parameter(defaultValue = "${project.build.directory}")
+    protected File buildDir;
+
+    /**
+     * The documentation directory
+     *
+     */
+    @Parameter(defaultValue = "${basedir}/../../../../components/")
+    protected File componentsDir;
+
+    /**
+     * Whether to fail the build fast if any Warnings was detected.
+     */
+    @Parameter
+    protected Boolean failFast;
+
+    /**
+     * Whether to fail if an option has no documentation.
+     */
+    @Parameter
+    protected Boolean failOnMissingDescription;
+
+    /**
+     * build context to check changed files and mark them for refresh (used for
+     * m2e compatibility)
+     */
+    @Component
+    private BuildContext buildContext;
+
+    @Override
+    public void execute() throws MojoExecutionException, MojoFailureException {
+        try {
+            executeStarter(project.getBasedir());
+        } catch (Exception e) {
+            throw new MojoFailureException("Error processing spring-configuration-metadata.json", e);
+        }
+    }
+
+    private void executeStarter(File starter) throws Exception {
+        File jsonFile = new File(buildDir, "classes/META-INF/spring-configuration-metadata.json");
+
+        // only if there is components we should update the documentation files
+        if (jsonFile.exists()) {
+            getLog().debug("Processing Spring Boot auto-configuration file: " + jsonFile);
+            Object js = Jsoner.deserialize(new FileReader(jsonFile));
+            if (js != null) {
+                String name = starter.getName();
+
+                if (!isValidStarter(name)) {
+                    return;
+                }
+
+                File compDir = getComponentsDir(name);
+
+                File[] docFiles;
+                File docFolder;
+                String componentName;
+                if ("camel-spring-boot".equals(name)) {
+                    // special for camel-spring-boot where we also want to auto-generate the options in the adoc file
+                    componentName = "spring-boot";
+                    docFolder = new File(compDir, "/src/main/docs/");
+                    docFiles = docFolder.listFiles(new ComponentDocFilter(componentName));
+                } else if ("camel-univocity-parsers-starter".equals(name)) {
+                    // special for univocity-parsers
+                    componentName = "univocity";
+                    docFolder = new File(compDir, "camel-univocity-parsers/src/main/docs/");
+                    docFiles = docFolder.listFiles(new ComponentDocFilter(componentName));
+                } else {
+                    // skip camel-  and -starter in the end
+                    componentName = name.substring(6, name.length() - 8);
+                    getLog().debug("Camel component: " + componentName);
+                    docFolder = new File(compDir, "camel-" + componentName + "/src/main/docs/");
+                    docFiles = docFolder.listFiles(new ComponentDocFilter(componentName));
+
+                    // maybe its one of those component that has subfolders with -api and -component
+                    if (docFiles == null || docFiles.length == 0) {
+                        docFolder = new File(compDir, "camel-" + componentName + "/camel-" + componentName + "-component/src/main/docs/");
+                        docFiles = docFolder.listFiles(new ComponentDocFilter(componentName));
+                    }
+                }
+
+                if (docFiles != null && docFiles.length > 0) {
+                    List<File> files = Arrays.asList(docFiles);
+
+                    // find out if the JAR has a Camel component, dataformat, or language
+                    boolean hasComponentDataFormatOrLanguage = files.stream().anyMatch(
+                            f -> f.getName().endsWith("-component.adoc") || f.getName().endsWith("-dataformat.adoc") || f.getName().endsWith("-language.adoc"));
+
+                    // if so then skip the root adoc file as its just a introduction to the others
+                    if (hasComponentDataFormatOrLanguage) {
+                        files = Arrays.stream(docFiles).filter(f -> !f.getName().equals(componentName + ".adoc")).collect(Collectors.toList());
+                    }
+
+                    if (files.size() == 1) {
+                        List<SpringBootAutoConfigureOptionModel> models = parseSpringBootAutoConfigureModels(jsonFile, null);
+
+                        // special for other kind of JARs that is not a regular Camel component,dataformat,language
+                        boolean onlyOther = files.size() == 1 && !hasComponentDataFormatOrLanguage;
+                        if (models.isEmpty() && onlyOther) {
+                            // there are no spring-boot auto configuration for this other kind of JAR so lets just ignore this
+                            return;
+                        }
+                        File docFile = files.get(0);
+
+                        // check for missing description on options
+                        boolean noDescription = false;
+                        for (SpringBootAutoConfigureOptionModel o : models) {
+                            if (Strings.isEmpty(o.getDescription())) {
+                                noDescription = true;
+                                getLog().warn("Option " + o.getName() + " has no description");
+                            }
+                        }
+                        if (noDescription && isFailOnNoDescription()) {
+                            throw new MojoExecutionException("Failed build due failOnMissingDescription=true");
+                        }
+
+                        String changed = templateAutoConfigurationOptions(models, componentName);
+                        boolean updated = updateAutoConfigureOptions(docFile, changed);
+                        if (updated) {
+                            getLog().info("Updated doc file: " + docFile);
+                        } else {
+                            getLog().debug("No changes to doc file: " + docFile);
+                        }
+                    } else if (files.size() > 1) {
+                        // when we have 2 or more files we need to filter the model options accordingly
+                        for (File docFile : files) {
+                            String docName = docFile.getName();
+                            int pos = docName.lastIndexOf("-");
+                            // spring-boot use lower cased keys
+                            String prefix = pos > 0 ? docName.substring(0, pos).toLowerCase(Locale.US) : null;
+
+                            List<SpringBootAutoConfigureOptionModel> models = parseSpringBootAutoConfigureModels(jsonFile, prefix);
+
+                            // check for missing description on options
+                            boolean noDescription = false;
+                            for (SpringBootAutoConfigureOptionModel o : models) {
+                                if (Strings.isEmpty(o.getDescription())) {
+                                    noDescription = true;
+                                    getLog().warn("Option " + o.getName() + " has no description");
+                                }
+                            }
+                            if (noDescription && isFailOnNoDescription()) {
+                                throw new MojoExecutionException("Failed build due failOnMissingDescription=true");
+                            }
+
+                            String changed = templateAutoConfigurationOptions(models, componentName);
+                            boolean updated = updateAutoConfigureOptions(docFile, changed);
+                            if (updated) {
+                                getLog().info("Updated doc file: " + docFile);
+                            } else {
+                                getLog().debug("No changes to doc file: " + docFile);
+                            }
+                        }
+                    }
+                } else {
+                    getLog().warn("No component docs found in folder: " + docFolder);
+                    if (isFailFast()) {
+                        throw new MojoExecutionException("Failed build due failFast=true");
+                    }
+                }
+            }
+        }
+    }
+
+    private File getComponentsDir(String name) {
+        if ("camel-spring-boot".equals(name)) {
+            // special for camel-spring-boot
+            return project.getBasedir();
+        } else {
+            return componentsDir;
+        }
+    }
+
+    private static final class ComponentDocFilter implements FileFilter {
+
+        private final String componentName;
+
+        public ComponentDocFilter(String componentName) {
+            this.componentName = asComponentName(componentName);
+        }
+
+        @Override
+        public boolean accept(File pathname) {
+            String name = pathname.getName();
+            return name.startsWith(componentName) && name.endsWith(".adoc");
+        }
+    }
+
+    private static String asComponentName(String componentName) {
+        if ("fastjson".equals(componentName)) {
+            return "json-fastjson";
+        } else if ("gson".equals(componentName)) {
+            return "json-gson";
+        } else if ("jackson".equals(componentName)) {
+            return "json-jackson";
+        } else if ("johnzon".equals(componentName)) {
+            return "json-johnzon";
+        } else if ("snakeyaml".equals(componentName)) {
+            return "yaml-snakeyaml";
+        } else if ("cassandraql".equals(componentName)) {
+            return "cql";
+        } else if ("josql".equals(componentName)) {
+            return "sql";
+        } else if ("juel".equals(componentName)) {
+            return "el";
+        } else if ("jsch".equals(componentName)) {
+            return "scp";
+        } else if ("printer".equals(componentName)) {
+            return "lpr";
+        } else if ("saxon".equals(componentName)) {
+            return "xquery";
+        } else if ("stringtemplate".equals(componentName)) {
+            return "string-template";
+        } else if ("tagsoup".equals(componentName)) {
+            return "tidyMarkup";
+        }
+        return componentName;
+    }
+
+    private static boolean isValidStarter(String name) {
+        // skip these
+        if ("camel-core-starter".equals(name)) {
+            return false;
+        }
+        return true;
+    }
+
+    private List<SpringBootAutoConfigureOptionModel> parseSpringBootAutoConfigureModels(File file, String include) throws IOException, DeserializationException {
+        getLog().debug("Parsing Spring Boot AutoConfigureModel using include: " + include);
+        List<SpringBootAutoConfigureOptionModel> answer = new ArrayList<>();
+
+        JsonObject obj = (JsonObject) Jsoner.deserialize(new FileReader(file));
+
+        JsonArray arr = obj.getCollection("properties");
+        if (arr != null && !arr.isEmpty()) {
+            arr.forEach(e -> {
+                JsonObject row = (JsonObject) e;
+                String name = row.getString("name");
+                String javaType = row.getString("type");
+                String desc = row.getStringOrDefault("description", "");
+                String defaultValue = row.getStringOrDefault("defaultValue", "");
+
+                // is the option deprecated then include that as well in the description
+                String deprecated = row.getStringOrDefault("deprecated", "");
+                String deprecationNote = row.getStringOrDefault("deprecationNote", "");
+                if ("true".equals(deprecated)) {
+                    desc = "*Deprecated* " + desc;
+                    if (!Strings.isEmpty(deprecationNote)) {
+                        if (!desc.endsWith(".")) {
+                            desc = desc + ". Deprecation note: " + deprecationNote;
+                        } else {
+                            desc = desc + " Deprecation note: " + deprecationNote;
+                        }
+                    }
+                }
+
+                // skip this special option and also if not matching the filter
+                boolean skip = name.endsWith("customizer.enabled") || include != null && !name.contains("." + include + ".");
+                if (!skip) {
+                    SpringBootAutoConfigureOptionModel model = new SpringBootAutoConfigureOptionModel();
+                    model.setName(name);
+                    model.setJavaType(javaType);
+                    model.setDefaultValue(defaultValue);
+                    model.setDescription(desc);
+                    answer.add(model);
+                }
+            });
+        }
+
+        return answer;
+    }
+
+    private boolean updateAutoConfigureOptions(File file, String changed) throws MojoExecutionException {
+        if (!file.exists()) {
+            return false;
+        }
+
+        try {
+            String text = loadText(new FileInputStream(file));
+
+            String existing = Strings.between(text, "// spring-boot-auto-configure options: START", "// spring-boot-auto-configure options: END");
+            if (existing != null) {
+                // remove leading line breaks etc
+                existing = existing.trim();
+                changed = changed.trim();
+                if (existing.equals(changed)) {
+                    return false;
+                } else {
+                    String before = Strings.before(text, "// spring-boot-auto-configure options: START");
+                    String after = Strings.after(text, "// spring-boot-auto-configure options: END");
+                    text = before + "// spring-boot-auto-configure options: START\n" + changed + "\n// spring-boot-auto-configure options: END" + after;
+                    writeText(file, text);
+                    return true;
+                }
+            } else {
+                getLog().warn("Cannot find markers in file " + file);
+                getLog().warn("Add the following markers");
+                getLog().warn("\t// spring-boot-auto-configure options: START");
+                getLog().warn("\t// spring-boot-auto-configure options: END");
+                if (isFailFast()) {
+                    throw new MojoExecutionException("Failed build due failFast=true");
+                }
+                return false;
+            }
+        } catch (Exception e) {
+            throw new MojoExecutionException("Error reading file " + file + " Reason: " + e, e);
+        }
+    }
+
+    private String templateAutoConfigurationOptions(List<SpringBootAutoConfigureOptionModel> options, String componentName) throws MojoExecutionException {
+        SpringBootModel model = new SpringBootModel();
+        model.setGroupId(project.getGroupId());
+        model.setArtifactId("camel-" + componentName + "-starter");
+        model.setVersion(project.getVersion());
+        model.setOptions(options);
+
+        try {
+            String template = loadText(UpdateSpringBootAutoConfigurationReadmeMojo.class.getClassLoader().getResourceAsStream("spring-boot-auto-configure-options.mvel"));
+            String out = (String) TemplateRuntime.eval(template, model, Collections.singletonMap("util", MvelHelper.INSTANCE));
+            return out;
+        } catch (Exception e) {
+            throw new MojoExecutionException("Error processing mvel template. Reason: " + e, e);
+        }
+    }
+
+    private boolean isFailFast() {
+        return failFast != null && failFast;
+    }
+
+    private boolean isFailOnNoDescription() {
+        return failOnMissingDescription != null && failOnMissingDescription;
+    }
+
+}
\ No newline at end of file


[camel-spring-boot] 02/02: 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-spring-boot.git

commit 2b2ec44c00bb0c5652b35fe239e032e72332d141
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Mon Jan 20 10:30:57 2020 +0100

    Regen
---
 .../springboot/catalog/components/activemq.json    |    2 +
 .../springboot/catalog/components/ahc-ws.json      |    5 +-
 .../springboot/catalog/components/ahc-wss.json     |    5 +-
 .../camel/springboot/catalog/components/ahc.json   |    5 +-
 .../camel/springboot/catalog/components/amqp.json  |    2 +
 .../camel/springboot/catalog/components/as2.json   |    2 +-
 .../catalog/components/atmosphere-websocket.json   |    1 -
 .../camel/springboot/catalog/components/atom.json  |    1 -
 .../catalog/components/atomix-multimap.json        |   37 +-
 .../springboot/catalog/components/aws-cw.json      |    3 +-
 .../springboot/catalog/components/aws-ddb.json     |    3 +-
 .../catalog/components/aws-ddbstream.json          |    1 -
 .../springboot/catalog/components/aws-ec2.json     |    3 +-
 .../springboot/catalog/components/aws-ecs.json     |    3 +-
 .../springboot/catalog/components/aws-eks.json     |    3 +-
 .../springboot/catalog/components/aws-iam.json     |    3 +-
 .../catalog/components/aws-kinesis-firehose.json   |    3 +-
 .../springboot/catalog/components/aws-kms.json     |    3 +-
 .../springboot/catalog/components/aws-lambda.json  |    7 +-
 .../springboot/catalog/components/aws-mq.json      |    3 +-
 .../springboot/catalog/components/aws-msk.json     |    3 +-
 .../springboot/catalog/components/aws-sdb.json     |    3 +-
 .../springboot/catalog/components/aws-ses.json     |    3 +-
 .../springboot/catalog/components/aws-sns.json     |    3 +-
 .../catalog/components/aws-translate.json          |    7 +-
 .../catalog/components/bean-validator.json         |    3 +-
 .../camel/springboot/catalog/components/bean.json  |   11 +-
 .../springboot/catalog/components/bonita.json      |   19 +-
 .../springboot/catalog/components/braintree.json   |    2 +
 .../catalog/components/caffeine-cache.json         |   12 +-
 .../catalog/components/caffeine-loadcache.json     |   12 +-
 .../springboot/catalog/components/chatscript.json  |    3 +-
 .../camel/springboot/catalog/components/chunk.json |    3 +-
 .../camel/springboot/catalog/components/class.json |   13 +-
 .../springboot/catalog/components/cm-sms.json      |    3 +-
 .../springboot/catalog/components/coap+tcp.json    |    1 +
 .../camel/springboot/catalog/components/coap.json  |    1 +
 .../springboot/catalog/components/coaps+tcp.json   |    1 +
 .../camel/springboot/catalog/components/coaps.json |    1 +
 .../springboot/catalog/components/consul.json      |   23 +-
 .../springboot/catalog/components/controlbus.json  |    3 +-
 .../camel/springboot/catalog/components/corda.json |   13 +-
 .../camel/springboot/catalog/components/cql.json   |    2 +-
 .../springboot/catalog/components/crypto-cms.json  |    5 +-
 .../springboot/catalog/components/crypto.json      |    3 +-
 .../camel/springboot/catalog/components/cxf.json   |    2 +-
 .../camel/springboot/catalog/components/cxfrs.json |    2 +-
 .../springboot/catalog/components/dataformat.json  |    3 +-
 .../catalog/components/dataset-test.json           |    3 +-
 .../springboot/catalog/components/dataset.json     |    3 +-
 .../catalog/components/debezium-mongodb.json       |    1 -
 .../catalog/components/debezium-mysql.json         |    1 -
 .../catalog/components/debezium-postgres.json      |    2 +-
 .../catalog/components/debezium-sqlserver.json     |    7 +-
 .../catalog/components/digitalocean.json           |    3 +-
 .../camel/springboot/catalog/components/dns.json   |    3 +-
 .../camel/springboot/catalog/components/dozer.json |    3 +-
 .../camel/springboot/catalog/components/drill.json |    3 +-
 .../springboot/catalog/components/ehcache.json     |    2 +-
 .../catalog/components/elasticsearch-rest.json     |    6 +-
 .../camel/springboot/catalog/components/elsql.json |    2 +-
 .../camel/springboot/catalog/components/exec.json  |    3 +-
 .../springboot/catalog/components/file-watch.json  |    1 -
 .../camel/springboot/catalog/components/flink.json |    3 +-
 .../camel/springboot/catalog/components/fop.json   |    3 +-
 .../springboot/catalog/components/freemarker.json  |    3 +-
 .../springboot/catalog/components/ganglia.json     |    5 +-
 .../springboot/catalog/components/geocoder.json    |    3 +-
 .../catalog/components/google-bigquery-sql.json    |    3 +-
 .../catalog/components/google-bigquery.json        |    3 +-
 .../catalog/components/google-calendar-stream.json |    1 -
 .../catalog/components/google-mail-stream.json     |    1 -
 .../catalog/components/google-sheets-stream.json   |    1 -
 .../springboot/catalog/components/graphql.json     |    3 +-
 .../catalog/components/hazelcast-atomicvalue.json  |    3 +-
 .../catalog/components/hazelcast-instance.json     |    1 -
 .../catalog/components/hazelcast-ringbuffer.json   |    3 +-
 .../catalog/components/hazelcast-set.json          |    2 +-
 .../camel/springboot/catalog/components/http.json  |    6 +-
 .../camel/springboot/catalog/components/https.json |    6 +-
 .../catalog/components/ignite-compute.json         |    3 +-
 .../catalog/components/ignite-events.json          |    1 -
 .../catalog/components/ignite-idgen.json           |    3 +-
 .../catalog/components/ignite-queue.json           |    3 +-
 .../springboot/catalog/components/ignite-set.json  |    3 +-
 .../springboot/catalog/components/influxdb.json    |    3 +-
 .../camel/springboot/catalog/components/iota.json  |    3 +-
 .../camel/springboot/catalog/components/ipfs.json  |   13 +-
 .../camel/springboot/catalog/components/irc.json   |    8 +-
 .../springboot/catalog/components/jcache.json      |    5 +-
 .../camel/springboot/catalog/components/jdbc.json  |    5 +-
 .../camel/springboot/catalog/components/jetty.json |    1 -
 .../camel/springboot/catalog/components/jing.json  |    3 +-
 .../camel/springboot/catalog/components/jira.json  |    2 +-
 .../camel/springboot/catalog/components/jms.json   |    2 +
 .../camel/springboot/catalog/components/jmx.json   |    1 -
 .../camel/springboot/catalog/components/jolt.json  |    3 +-
 .../catalog/components/json-validator.json         |    3 +-
 .../camel/springboot/catalog/components/jt400.json |   14 +-
 .../camel/springboot/catalog/components/kafka.json |    1 +
 .../catalog/components/kubernetes-config-maps.json |    3 +-
 .../kubernetes-persistent-volumes-claims.json      |    3 +-
 .../components/kubernetes-persistent-volumes.json  |    3 +-
 .../components/kubernetes-resources-quota.json     |    3 +-
 .../catalog/components/kubernetes-secrets.json     |    3 +-
 .../components/kubernetes-service-accounts.json    |    3 +-
 .../catalog/components/kubernetes-services.json    |    2 +-
 .../camel/springboot/catalog/components/kudu.json  |    3 +-
 .../springboot/catalog/components/language.json    |    3 +-
 .../camel/springboot/catalog/components/ldap.json  |    3 +-
 .../camel/springboot/catalog/components/ldif.json  |    3 +-
 .../camel/springboot/catalog/components/log.json   |    7 +-
 .../camel/springboot/catalog/components/lpr.json   |    3 +-
 .../springboot/catalog/components/lucene.json      |    3 +-
 .../springboot/catalog/components/lumberjack.json  |    1 -
 .../springboot/catalog/components/master.json      |    1 -
 .../springboot/catalog/components/metrics.json     |    3 +-
 .../springboot/catalog/components/micrometer.json  |    3 +-
 .../camel/springboot/catalog/components/mock.json  |    3 +-
 .../springboot/catalog/components/mongodb.json     |    6 +-
 .../camel/springboot/catalog/components/msv.json   |    3 +-
 .../springboot/catalog/components/mustache.json    |    3 +-
 .../camel/springboot/catalog/components/mvel.json  |    3 +-
 .../catalog/components/mybatis-bean.json           |    3 +-
 .../springboot/catalog/components/nagios.json      |    4 +-
 .../camel/springboot/catalog/components/nats.json  |   20 +-
 .../springboot/catalog/components/netty-http.json  |   10 +-
 .../camel/springboot/catalog/components/netty.json |    8 +-
 .../camel/springboot/catalog/components/nsq.json   |    7 +-
 .../components/openshift-build-configs.json        |    3 +-
 .../catalog/components/openshift-builds.json       |    3 +-
 .../catalog/components/openstack-cinder.json       |    3 +-
 .../catalog/components/openstack-glance.json       |    3 +-
 .../catalog/components/openstack-keystone.json     |    3 +-
 .../catalog/components/openstack-neutron.json      |    3 +-
 .../catalog/components/openstack-nova.json         |    3 +-
 .../catalog/components/openstack-swift.json        |    3 +-
 .../camel/springboot/catalog/components/pdf.json   |    3 +-
 .../catalog/components/pg-replication-slot.json    |    1 -
 .../catalog/components/platform-http.json          |    1 -
 .../springboot/catalog/components/quartz.json      |    4 +-
 .../springboot/catalog/components/rest-api.json    |    1 -
 .../catalog/components/rest-swagger.json           |    6 +-
 .../camel/springboot/catalog/components/rest.json  |    4 +-
 .../camel/springboot/catalog/components/rss.json   |    1 -
 .../camel/springboot/catalog/components/saga.json  |    3 +-
 .../springboot/catalog/components/salesforce.json  |    2 +-
 .../catalog/components/sap-netweaver.json          |    3 +-
 .../springboot/catalog/components/scheduler.json   |    1 -
 .../springboot/catalog/components/schematron.json  |    3 +-
 .../camel/springboot/catalog/components/scp.json   |    3 +-
 .../camel/springboot/catalog/components/seda.json  |    2 +
 .../springboot/catalog/components/service.json     |    1 -
 .../springboot/catalog/components/servicenow.json  |    3 +-
 .../springboot/catalog/components/servlet.json     |    1 -
 .../camel/springboot/catalog/components/sftp.json  |    4 +-
 .../springboot/catalog/components/sjms-batch.json  |    1 -
 .../camel/springboot/catalog/components/solr.json  |    3 +-
 .../springboot/catalog/components/solrCloud.json   |    3 +-
 .../camel/springboot/catalog/components/solrs.json |    3 +-
 .../springboot/catalog/components/soroush.json     |    4 +-
 .../camel/springboot/catalog/components/spark.json |    3 +-
 .../catalog/components/spring-batch.json           |    3 +-
 .../springboot/catalog/components/spring-ldap.json |    3 +-
 .../springboot/catalog/components/sql-stored.json  |    3 +-
 .../camel/springboot/catalog/components/stax.json  |    3 +-
 .../camel/springboot/catalog/components/stomp.json |    2 +
 .../catalog/components/string-template.json        |    3 +-
 .../camel/springboot/catalog/components/stub.json  |    2 +
 .../springboot/catalog/components/telegram.json    |    6 +
 .../camel/springboot/catalog/components/tika.json  |    3 +-
 .../camel/springboot/catalog/components/timer.json |    1 -
 .../springboot/catalog/components/undertow.json    |    2 +-
 .../springboot/catalog/components/validator.json   |    3 +-
 .../springboot/catalog/components/velocity.json    |    3 +-
 .../camel/springboot/catalog/components/vm.json    |    2 +
 .../camel/springboot/catalog/components/web3j.json |    6 +-
 .../springboot/catalog/components/webhook.json     |    1 -
 .../catalog/components/websocket-jsr356.json       |    8 +-
 .../springboot/catalog/components/wordpress.json   |    2 +-
 .../springboot/catalog/components/xchange.json     |    5 +-
 .../camel/springboot/catalog/components/xj.json    |    3 +-
 .../springboot/catalog/components/xmlsecurity.json |    3 +-
 .../springboot/catalog/components/xslt-saxon.json  |    3 +-
 .../camel/springboot/catalog/components/xslt.json  |    3 +-
 .../catalog/components/zookeeper-master.json       |    1 -
 .../catalog/others/spring-cloud-consul.json        |    2 +-
 .../catalog/others/spring-cloud-netflix.json       |    2 +-
 .../catalog/others/spring-cloud-zookeeper.json     |    2 +-
 .../springboot/catalog/others/spring-cloud.json    |    2 +-
 .../springboot/ActiveMQComponentConfiguration.java |   32 +
 .../ahc/springboot/AhcComponentConfiguration.java  |   17 -
 .../ws/springboot/WsComponentConfiguration.java    |   17 -
 .../springboot/AMQPComponentConfiguration.java     |   32 +
 .../WebsocketComponentConfiguration.java           |   19 -
 .../springboot/AtomComponentConfiguration.java     |   19 -
 .../AtomixMultiMapComponentConfiguration.java      |   17 -
 .../cw/springboot/CwComponentConfiguration.java    |   17 -
 .../ddb/springboot/DdbComponentConfiguration.java  |   17 -
 .../DdbStreamComponentConfiguration.java           |   19 -
 .../ec2/springboot/EC2ComponentConfiguration.java  |   17 -
 .../ecs/springboot/ECSComponentConfiguration.java  |   17 -
 .../eks/springboot/EKSComponentConfiguration.java  |   17 -
 .../iam/springboot/IAMComponentConfiguration.java  |   17 -
 .../KinesisFirehoseComponentConfiguration.java     |   17 -
 .../kms/springboot/KMSComponentConfiguration.java  |   17 -
 .../springboot/LambdaComponentConfiguration.java   |   31 +-
 .../mq/springboot/MQComponentConfiguration.java    |   17 -
 .../msk/springboot/MSKComponentConfiguration.java  |   17 -
 .../sdb/springboot/SdbComponentConfiguration.java  |   17 -
 .../ses/springboot/SesComponentConfiguration.java  |   17 -
 .../sns/springboot/SnsComponentConfiguration.java  |   17 -
 .../TranslateComponentConfiguration.java           |   43 +-
 .../springboot/BeanComponentConfiguration.java     |   54 +-
 .../springboot/ClassComponentConfiguration.java    |   56 +-
 .../BeanValidatorComponentConfiguration.java       |   17 -
 .../springboot/BonitaComponentConfiguration.java   |   17 -
 .../BraintreeComponentConfiguration.java           |   29 +
 .../CaffeineCacheComponentConfiguration.java       |   17 -
 .../CaffeineLoadCacheComponentConfiguration.java   |   17 -
 .../CassandraComponentConfiguration.java           |    2 +-
 .../ChatScriptComponentConfiguration.java          |   17 -
 .../springboot/ChunkComponentConfiguration.java    |   17 -
 .../cm/springboot/CMComponentConfiguration.java    |   17 -
 .../springboot/ConsulComponentConfiguration.java   |   57 +-
 .../ControlBusComponentConfiguration.java          |   17 -
 components-starter/camel-corda-starter/pom.xml     |   12 -
 .../springboot/CordaComponentConfiguration.java    |   25 +-
 .../HystrixConfigurationDefinitionCommon.java      |  168 ++--
 .../CryptoCmsComponentConfiguration.java           |   17 -
 .../DigitalSignatureComponentConfiguration.java    |   17 -
 .../DataFormatComponentConfiguration.java          |   17 -
 .../springboot/DataSetComponentConfiguration.java  |   17 -
 .../DataSetTestComponentConfiguration.java         |   17 -
 .../DebeziumMongodbComponentConfiguration.java     |   19 -
 .../DebeziumMySqlComponentConfiguration.java       |   19 -
 .../DebeziumPostgresComponentConfiguration.java    |   34 +-
 .../DebeziumSqlserverComponentConfiguration.java   |   55 +-
 .../DigitalOceanComponentConfiguration.java        |   17 -
 .../dns/springboot/DnsComponentConfiguration.java  |   17 -
 .../springboot/DozerComponentConfiguration.java    |   17 -
 .../springboot/DrillComponentConfiguration.java    |   17 -
 .../springboot/EhcacheComponentConfiguration.java  |    9 +-
 .../ElasticsearchComponentConfiguration.java       |   17 -
 .../springboot/ExecComponentConfiguration.java     |   17 -
 .../FileWatchComponentConfiguration.java           |   19 -
 .../springboot/FlinkComponentConfiguration.java    |   17 -
 .../fop/springboot/FopComponentConfiguration.java  |   17 -
 .../FreemarkerComponentConfiguration.java          |   17 -
 .../springboot/GangliaComponentConfiguration.java  |   17 -
 .../springboot/GeoCoderComponentConfiguration.java |   17 -
 .../GoogleBigQueryComponentConfiguration.java      |   17 -
 .../GoogleBigQuerySQLComponentConfiguration.java   |   17 -
 ...GoogleCalendarStreamComponentConfiguration.java |   19 -
 .../GoogleMailStreamComponentConfiguration.java    |   19 -
 .../GoogleSheetsStreamComponentConfiguration.java  |   19 -
 .../springboot/GraphqlComponentConfiguration.java  |   17 -
 ...azelcastAtomicnumberComponentConfiguration.java |   17 -
 .../HazelcastInstanceComponentConfiguration.java   |   19 -
 .../HazelcastRingbufferComponentConfiguration.java |   17 -
 .../HazelcastSetComponentConfiguration.java        |    2 +-
 .../springboot/HttpComponentConfiguration.java     |   17 -
 .../IgniteComputeComponentConfiguration.java       |   17 -
 .../IgniteEventsComponentConfiguration.java        |   19 -
 .../IgniteIdGenComponentConfiguration.java         |   17 -
 .../IgniteQueueComponentConfiguration.java         |   17 -
 .../IgniteSetComponentConfiguration.java           |   17 -
 .../springboot/InfluxDbComponentConfiguration.java |   17 -
 .../springboot/IOTAComponentConfiguration.java     |   17 -
 .../springboot/IPFSComponentConfiguration.java     |   41 +-
 .../springboot/JCacheComponentConfiguration.java   |   25 +-
 .../springboot/JdbcComponentConfiguration.java     |   17 -
 .../JettyHttpComponentConfiguration9.java          |   19 -
 .../springboot/JingComponentConfiguration.java     |   17 -
 .../springboot/JiraComponentConfiguration.java     |    2 +-
 .../jms/springboot/JmsComponentConfiguration.java  |   32 +
 .../jmx/springboot/JMXComponentConfiguration.java  |   19 -
 .../springboot/JoltComponentConfiguration.java     |   17 -
 .../scp/springboot/ScpComponentConfiguration.java  |   17 -
 .../JsonValidatorComponentConfiguration.java       |   17 -
 .../springboot/KafkaComponentConfiguration.java    |   18 +
 ...KubernetesConfigMapsComponentConfiguration.java |   17 -
 ...tesPersistentVolumesComponentConfiguration.java |   17 -
 ...sistentVolumesClaimsComponentConfiguration.java |   17 -
 ...rnetesResourcesQuotaComponentConfiguration.java |   17 -
 .../KubernetesSecretsComponentConfiguration.java   |   17 -
 ...netesServiceAccountsComponentConfiguration.java |   17 -
 .../KubernetesServicesComponentConfiguration.java  |    4 +-
 ...penshiftBuildConfigsComponentConfiguration.java |   17 -
 .../OpenshiftBuildsComponentConfiguration.java     |   17 -
 .../springboot/KuduComponentConfiguration.java     |   17 -
 .../springboot/LanguageComponentConfiguration.java |   17 -
 .../springboot/LdapComponentConfiguration.java     |   17 -
 .../springboot/LdifComponentConfiguration.java     |   17 -
 .../log/springboot/LogComponentConfiguration.java  |   17 -
 .../springboot/LuceneComponentConfiguration.java   |   17 -
 .../LumberjackComponentConfiguration.java          |   19 -
 .../springboot/MasterComponentConfiguration.java   |   19 -
 .../springboot/MetricsComponentConfiguration.java  |   17 -
 .../MicrometerComponentConfiguration.java          |   17 -
 .../springboot/MockComponentConfiguration.java     |   17 -
 .../springboot/MongoDbComponentConfiguration.java  |    2 +-
 .../msv/springboot/MsvComponentConfiguration.java  |   17 -
 .../springboot/MustacheComponentConfiguration.java |   17 -
 .../springboot/MvelComponentConfiguration.java     |   17 -
 .../MyBatisBeanComponentConfiguration.java         |   17 -
 .../springboot/NagiosComponentConfiguration.java   |   35 -
 .../springboot/NatsComponentConfiguration.java     |   13 +
 .../NettyHttpComponentConfiguration.java           |   12 +-
 .../springboot/NettyComponentConfiguration.java    |   18 +-
 .../nsq/springboot/NsqComponentConfiguration.java  |   13 +
 .../springboot/CinderComponentConfiguration.java   |   17 -
 .../springboot/GlanceComponentConfiguration.java   |   17 -
 .../springboot/KeystoneComponentConfiguration.java |   17 -
 .../springboot/NeutronComponentConfiguration.java  |   17 -
 .../springboot/NovaComponentConfiguration.java     |   17 -
 .../springboot/SwiftComponentConfiguration.java    |   17 -
 .../pdf/springboot/PdfComponentConfiguration.java  |   17 -
 .../PgReplicationSlotComponentConfiguration.java   |   19 -
 .../PlatformHttpComponentConfiguration.java        |   19 -
 .../springboot/PrinterComponentConfiguration.java  |   17 -
 .../springboot/QuartzComponentConfiguration.java   |   42 +-
 .../springboot/RestApiComponentConfiguration.java  |   19 -
 .../camel-rest-swagger-starter/pom.xml             |    8 +
 .../RestSwaggerComponentConfiguration.java         |   17 -
 .../rss/springboot/RssComponentConfiguration.java  |   19 -
 .../springboot/SagaComponentConfiguration.java     |   17 -
 .../SalesforceComponentConfiguration.java          |    2 +-
 .../NetWeaverComponentConfiguration.java           |   17 -
 .../SchedulerComponentConfiguration.java           |   19 -
 .../SchematronComponentConfiguration.java          |   17 -
 .../springboot/SedaComponentConfiguration.java     |   15 +
 .../springboot/ServiceComponentConfiguration.java  |   19 -
 .../ServiceNowComponentConfiguration.java          |   17 -
 .../springboot/ServletComponentConfiguration.java  |   19 -
 .../SjmsBatchComponentConfiguration.java           |   19 -
 .../springboot/SolrComponentConfiguration.java     |   17 -
 .../springboot/SparkComponentConfiguration.java    |   17 -
 .../SpringBatchComponentConfiguration.java         |   17 -
 .../SpringLdapComponentConfiguration.java          |   17 -
 .../SqlStoredComponentConfiguration.java           |   17 -
 .../ssh/springboot/SshComponentConfiguration.java  |   14 -
 .../springboot/StAXComponentConfiguration.java     |   17 -
 .../springboot/StompComponentConfiguration.java    |   25 +
 .../StringTemplateComponentConfiguration.java      |   17 -
 .../springboot/StubComponentConfiguration.java     |   15 +
 .../springboot/TelegramComponentConfiguration.java |   40 +
 .../springboot/TikaComponentConfiguration.java     |   17 -
 .../springboot/TimerComponentConfiguration.java    |   19 -
 .../ValidatorComponentConfiguration.java           |   17 -
 .../springboot/VelocityComponentConfiguration.java |   17 -
 .../vm/springboot/VmComponentConfiguration.java    |   15 +
 .../springboot/Web3jComponentConfiguration.java    |   19 +-
 .../springboot/WebhookComponentConfiguration.java  |   19 -
 .../springboot/XChangeComponentConfiguration.java  |   17 -
 .../xj/springboot/XJComponentConfiguration.java    |   17 -
 .../XmlSignatureComponentConfiguration.java        |   17 -
 .../XsltSaxonComponentConfiguration.java           |   17 -
 .../springboot/XsltComponentConfiguration.java     |   17 -
 .../springboot/MasterComponentConfiguration.java   |   19 -
 tooling/camel-spring-boot-dependencies/pom.xml     | 1055 +++++++++++---------
 361 files changed, 1570 insertions(+), 3553 deletions(-)

diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
index 1efce64..ee48c33 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
@@ -25,6 +25,8 @@
     "usePooledConnection": { "kind": "property", "displayName": "Use Pooled Connection", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables or disables whether a PooledConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used rather than the default with the Spring JmsTemplate which will create a [...]
     "useSingleConnection": { "kind": "property", "displayName": "Use Single Connection", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables or disables whether a Spring SingleConnectionFactory will be used so that when messages are sent to ActiveMQ from outside of a message consuming thread, pooling will be used rather than the default with the Spring JmsTemplate which will c [...]
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsConfiguration", "deprecated": false, "secret": false, "description": "Configuration of ActiveMQ" },
+    "allowAutoWiredConnectionFactory": {"kind":"property","displayName":"Allow Auto Wired Connection Factory","group":"advanced","label":"advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default."},
+    "allowAutoWiredDestinationResolver": {"kind":"property","displayName":"Allow Auto Wired Destination Resolver","group":"advanced","label":"advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default."},
     "acceptMessagesWhileStopping": {"kind":"property","displayName":"Accept Messages While Stopping","group":"consumer (advanced)","label":"consumer,advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Specifies whether the consumer accept messages while it is stopping. You may consider enabling this option, if you start and stop JMS routes at runtime, while there are still messages enqueued on the queue. I [...]
     "allowReplyManagerQuickStop": {"kind":"property","displayName":"Allow Reply Manager Quick Stop","group":"consumer (advanced)","label":"consumer,advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptM [...]
     "acknowledgementMode": {"kind":"property","displayName":"Acknowledgement Mode","group":"consumer","label":"consumer","required":false,"type":"integer","javaType":"int","deprecated":false,"secret":false,"description":"The JMS acknowledgement mode defined as an Integer. Allows you to set vendor-specific extensions to the acknowledgment mode. For the regular modes, it is preferable to use the acknowledgementModeName instead."},
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-ws.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-ws.json
index ba486c6..f01e354 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-ws.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-ws.json
@@ -29,8 +29,7 @@
     "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."},
     "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."},
     "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"},
-    "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 route to fail being sta [...]
-    "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 the routing Error Han [...]
+    "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 route to fail being sta [...]
   },
   "properties": {
     "sendMessageOnError": { "kind": "parameter", "displayName": "Send Message On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to send an message if the web-socket listener received an error." },
@@ -39,7 +38,7 @@
     "bridgeEndpoint": {"kind":"parameter","displayName":"Bridge Endpoint","group":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"If the option is true, then the Exchange.HTTP_URI header is ignored, and use the endpoint's URI for request. You may also set the throwExceptionOnFailure to be false to let the AhcProducer send all the fault response back."},
     "bufferSize": {"kind":"parameter","displayName":"Buffer Size","group":"producer","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."},
     "connectionClose": {"kind":"parameter","displayName":"Connection Close","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Define if the Connection Close header has to be added to HTTP Request. This parameter is false by default"},
-    "cookieHandler": {"kind":"parameter","displayName":"Cookie Handler","group":"producer","label":"producer","required":false,"type":"object","javaType":"org.apache.camel.http.common.cookie.CookieHandler","deprecated":false,"secret":false,"description":"Configure a cookie handler to maintain a HTTP session"},
+    "cookieHandler": {"kind":"parameter","displayName":"Cookie Handler","group":"producer","label":"producer","required":false,"type":"object","javaType":"org.apache.camel.http.base.cookie.CookieHandler","deprecated":false,"secret":false,"description":"Configure a cookie handler to maintain a HTTP session"},
     "headerFilterStrategy": {"kind":"parameter","displayName":"Header Filter Strategy","group":"producer","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."},
     "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 route to fail being st [...]
     "throwExceptionOnFailure": {"kind":"parameter","displayName":"Throw Exception On Failure","group":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":true,"description":"Option to disable throwing the AhcOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code."},
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-wss.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-wss.json
index d0c821e..972a894 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-wss.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc-wss.json
@@ -29,8 +29,7 @@
     "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."},
     "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."},
     "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"},
-    "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 route to fail being sta [...]
-    "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 the routing Error Han [...]
+    "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 route to fail being sta [...]
   },
   "properties": {
     "sendMessageOnError": { "kind": "parameter", "displayName": "Send Message On Error", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to send an message if the web-socket listener received an error." },
@@ -39,7 +38,7 @@
     "bridgeEndpoint": {"kind":"parameter","displayName":"Bridge Endpoint","group":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"If the option is true, then the Exchange.HTTP_URI header is ignored, and use the endpoint's URI for request. You may also set the throwExceptionOnFailure to be false to let the AhcProducer send all the fault response back."},
     "bufferSize": {"kind":"parameter","displayName":"Buffer Size","group":"producer","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."},
     "connectionClose": {"kind":"parameter","displayName":"Connection Close","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Define if the Connection Close header has to be added to HTTP Request. This parameter is false by default"},
-    "cookieHandler": {"kind":"parameter","displayName":"Cookie Handler","group":"producer","label":"producer","required":false,"type":"object","javaType":"org.apache.camel.http.common.cookie.CookieHandler","deprecated":false,"secret":false,"description":"Configure a cookie handler to maintain a HTTP session"},
+    "cookieHandler": {"kind":"parameter","displayName":"Cookie Handler","group":"producer","label":"producer","required":false,"type":"object","javaType":"org.apache.camel.http.base.cookie.CookieHandler","deprecated":false,"secret":false,"description":"Configure a cookie handler to maintain a HTTP session"},
     "headerFilterStrategy": {"kind":"parameter","displayName":"Header Filter Strategy","group":"producer","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."},
     "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 route to fail being st [...]
     "throwExceptionOnFailure": {"kind":"parameter","displayName":"Throw Exception On Failure","group":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":true,"description":"Option to disable throwing the AhcOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code."},
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc.json
index 2e6a653..27a035e 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ahc.json
@@ -27,15 +27,14 @@
     "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." },
     "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." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "httpUri": { "kind": "path", "displayName": "Http Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The URI to use such as http://hostname:port/path" },
     "bridgeEndpoint": { "kind": "parameter", "displayName": "Bridge Endpoint", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the option is true, then the Exchange.HTTP_URI header is ignored, and use the endpoint's URI for request. You may also set the throwExceptionOnFailure to be false to let the AhcProducer send all the fault response back." },
     "bufferSize": { "kind": "parameter", "displayName": "Buffer Size", "group": "producer", "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." },
     "connectionClose": { "kind": "parameter", "displayName": "Connection Close", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Define if the Connection Close header has to be added to HTTP Request. This parameter is false by default" },
-    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
+    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "producer", "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." },
     "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  [...]
     "throwExceptionOnFailure": { "kind": "parameter", "displayName": "Throw Exception On Failure", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Option to disable throwing the AhcOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json
index 794b721..3dcb9c4 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json
@@ -21,6 +21,8 @@
   },
   "componentProperties": {
     "includeAmqpAnnotations": { "kind": "property", "displayName": "Include Amqp Annotations", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to include AMQP annotations when mapping from AMQP to Camel Message. Setting this to true will map AMQP message annotations to message headers. Due to limitations in Apache Qpid JMS API, currently delivery annotations are ignored." },
+    "allowAutoWiredConnectionFactory": {"kind":"property","displayName":"Allow Auto Wired Connection Factory","group":"advanced","label":"advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled by default."},
+    "allowAutoWiredDestinationResolver": {"kind":"property","displayName":"Allow Auto Wired Destination Resolver","group":"advanced","label":"advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This is enabled by default."},
     "configuration": {"kind":"property","displayName":"Configuration","group":"advanced","label":"advanced","required":false,"type":"object","javaType":"org.apache.camel.component.jms.JmsConfiguration","deprecated":false,"secret":false,"description":"To use a shared JMS configuration"},
     "acceptMessagesWhileStopping": {"kind":"property","displayName":"Accept Messages While Stopping","group":"consumer (advanced)","label":"consumer,advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Specifies whether the consumer accept messages while it is stopping. You may consider enabling this option, if you start and stop JMS routes at runtime, while there are still messages enqueued on the queue. I [...]
     "allowReplyManagerQuickStop": {"kind":"property","displayName":"Allow Reply Manager Quick Stop","group":"consumer (advanced)","label":"consumer,advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsConfiguration#isAcceptM [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json
index 650df18..6ada5de 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/as2.json
@@ -5,7 +5,7 @@
     "syntax": "as2:apiName/methodName",
     "title": "AS2",
     "description": "Component used for transferring data secure and reliable over the internet using the AS2 protocol.",
-    "label": "AS2",
+    "label": "file",
     "deprecated": false,
     "deprecationNote": "",
     "async": false,
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
index ef427cb..a7b9d0a 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atmosphere-websocket.json
@@ -29,7 +29,6 @@
     "allowJavaSerializedObject": {"kind":"property","displayName":"Allow Java Serialized Object","group":"advanced","label":"advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether to allow java serialization when a request uses context-type=application\/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the reques [...]
     "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."},
     "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"},
-    "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 route to fail being sta [...]
     "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 the routing Error Han [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
index 389b0ac..90b69d2 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atom.json
@@ -20,7 +20,6 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atomix-multimap.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atomix-multimap.json
index a785907..53d63004 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atomix-multimap.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/atomix-multimap.json
@@ -9,8 +9,8 @@
     "deprecated": false,
     "deprecationNote": "",
     "async": false,
-    "consumerOnly": true,
-    "producerOnly": false,
+    "consumerOnly": false,
+    "producerOnly": true,
     "lenientProperties": false,
     "javaType": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapComponent",
     "firstVersion": "2.20.0",
@@ -19,27 +19,24 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
-    "configuration": { "kind": "property", "displayName": "Configuration", "group": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "deprecated": false, "secret": false, "description": "The shared component configuration" },
-    "atomix": { "kind": "property", "displayName": "Atomix", "group": "consumer", "required": false, "type": "object", "javaType": "io.atomix.AtomixClient", "deprecated": false, "secret": false, "description": "The shared AtomixClient instance" },
-    "nodes": { "kind": "property", "displayName": "Nodes", "group": "consumer", "required": false, "type": "array", "javaType": "java.util.List<io.atomix.catalyst.transport.Address>", "deprecated": false, "secret": false, "description": "The nodes the AtomixClient should connect to" },
-    "configurationUri": { "kind": "property", "displayName": "Configuration Uri", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The path to the AtomixClient configuration" },
+    "configuration": { "kind": "property", "displayName": "Configuration", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "deprecated": false, "secret": false, "description": "The shared component configuration" },
+    "atomix": { "kind": "property", "displayName": "Atomix", "group": "producer", "required": false, "type": "object", "javaType": "io.atomix.AtomixClient", "deprecated": false, "secret": false, "description": "The shared AtomixClient instance" },
+    "nodes": { "kind": "property", "displayName": "Nodes", "group": "producer", "required": false, "type": "array", "javaType": "java.util.List<io.atomix.catalyst.transport.Address>", "deprecated": false, "secret": false, "description": "The nodes the AtomixClient should connect to" },
+    "configurationUri": { "kind": "property", "displayName": "Configuration Uri", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The path to the AtomixClient configuration" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
-    "resourceName": { "kind": "path", "displayName": "Resource Name", "group": "consumer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The distributed resource name" },
-    "atomix": { "kind": "parameter", "displayName": "Atomix", "group": "consumer", "required": false, "type": "object", "javaType": "io.atomix.Atomix", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The Atomix instance to use" },
-    "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
-    "configurationUri": { "kind": "parameter", "displayName": "Configuration Uri", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The Atomix configuration uri." },
-    "defaultAction": { "kind": "parameter", "displayName": "Default Action", "group": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action", "deprecated": false, "secret": false, "defaultValue": "PUT", "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The default action." },
-    "key": { "kind": "parameter", "displayName": "Key", "group": "consumer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The key to use if none is set in the header or to listen for events for a specific key." },
-    "nodes": { "kind": "parameter", "displayName": "Nodes", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The address of the nodes composing the cluster." },
-    "resultHeader": { "kind": "parameter", "displayName": "Result Header", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The header that wil carry the result." },
-    "transportClassName": { "kind": "parameter", "displayName": "Transport Class Name", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "io.atomix.catalyst.transport.netty.NettyTransport", "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The class name (fqn) of the Atomix transport" },
-    "ttl": { "kind": "parameter", "displayName": "Ttl", "group": "consumer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The resource ttl." },
-    "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." },
+    "resourceName": { "kind": "path", "displayName": "Resource Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The distributed resource name" },
+    "atomix": { "kind": "parameter", "displayName": "Atomix", "group": "producer", "required": false, "type": "object", "javaType": "io.atomix.Atomix", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The Atomix instance to use" },
+    "configurationUri": { "kind": "parameter", "displayName": "Configuration Uri", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The Atomix configuration uri." },
+    "defaultAction": { "kind": "parameter", "displayName": "Default Action", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action", "deprecated": false, "secret": false, "defaultValue": "PUT", "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The default action." },
+    "key": { "kind": "parameter", "displayName": "Key", "group": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The key to use if none is set in the header or to listen for events for a specific key." },
+    "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  [...]
+    "nodes": { "kind": "parameter", "displayName": "Nodes", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The address of the nodes composing the cluster." },
+    "resultHeader": { "kind": "parameter", "displayName": "Result Header", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The header that wil carry the result." },
+    "transportClassName": { "kind": "parameter", "displayName": "Transport Class Name", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "io.atomix.catalyst.transport.netty.NettyTransport", "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The class name (fqn) of the Atomix transport" },
+    "ttl": { "kind": "parameter", "displayName": "Ttl", "group": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The resource ttl." },
     "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" },
     "defaultResourceConfig": { "kind": "parameter", "displayName": "Default Resource Config", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The cluster wide default resource configuration." },
     "defaultResourceOptions": { "kind": "parameter", "displayName": "Default Resource Options", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration", "configurationField": "configuration", "description": "The local default resource options." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-cw.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-cw.json
index 0e375e0..1c3375a 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-cw.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-cw.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which CW client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "namespace": { "kind": "path", "displayName": "Namespace", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The metric namespace" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ddb.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ddb.json
index 7902e14..2f21cb1 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ddb.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ddb.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which DDB client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "tableName": { "kind": "path", "displayName": "Table Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the table currently worked with." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ddbstream.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ddbstream.json
index 5fd2e3c..776398d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ddbstream.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ddbstream.json
@@ -24,7 +24,6 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Region" },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ec2.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ec2.json
index e449797..0520baa 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ec2.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ec2.json
@@ -24,8 +24,7 @@
     "accessKey": { "kind": "property", "displayName": "Access Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Access Key" },
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Logical name" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ecs.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ecs.json
index e21b232..01ed983 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ecs.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ecs.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which ECS client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Logical name" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-eks.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-eks.json
index bdac9dd..fe3a8e6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-eks.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-eks.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which EKS client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Logical name" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-iam.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-iam.json
index b300d92..07f81d6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-iam.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-iam.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which IAM client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Logical name" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-kinesis-firehose.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-kinesis-firehose.json
index dde4d52..1764e35 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-kinesis-firehose.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-kinesis-firehose.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Region" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "streamName": { "kind": "path", "displayName": "Stream Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of the stream" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-kms.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-kms.json
index b7daafe..97ce73b 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-kms.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-kms.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which KMS client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Logical name" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-lambda.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-lambda.json
index bac248c..5bfb5cd 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-lambda.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-lambda.json
@@ -24,20 +24,19 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Region" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "function": { "kind": "path", "displayName": "Function", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of the Lambda function." },
     "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  [...]
-    "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws.lambda.LambdaOperations", "enum": [ "listFunctions", "getFunction", "createFunction", "deleteFunction", "invokeFunction", "updateFunction", "createEventSourceMapping", "deleteEventSourceMapping", "listEventSourceMapping", "listTags", "tagResource", "untagResource", "publishVersion", "listVersions" ], "deprecated": false,  [...]
-    "proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "producer", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.lambda.LambdaConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the Lambda client" },
+    "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws.lambda.LambdaOperations", "enum": [ "listFunctions", "getFunction", "createAlias", "deleteAlias", "getAlias", "listAliases", "createFunction", "deleteFunction", "invokeFunction", "updateFunction", "createEventSourceMapping", "deleteEventSourceMapping", "listEventSourceMapping", "listTags", "tagResource", "untagResource", [...]
     "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.lambda.LambdaConfiguration", "configurationField": "configuration", "description": "Amazon AWS Region. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll n [...]
     "awsLambdaClient": { "kind": "parameter", "displayName": "Aws Lambda Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.amazonaws.services.lambda.AWSLambda", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.lambda.LambdaConfiguration", "configurationField": "configuration", "description": "To use a existing configured AwsLambdaClient as client" },
     "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)." },
     "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.lambda.LambdaConfiguration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the Lambda 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.lambda.LambdaConfiguration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the Lambda client" },
+    "proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "proxy", "label": "proxy", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.lambda.LambdaConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the Lambda client" },
     "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.lambda.LambdaConfiguration", "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.lambda.LambdaConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }
   }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-mq.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-mq.json
index 54d7363..c1dc991 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-mq.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-mq.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which MQ client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Logical name" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-msk.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-msk.json
index 317e0ed..388c130 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-msk.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-msk.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which MSK client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Logical name" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-sdb.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-sdb.json
index 066d2da..c08b9c5 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-sdb.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-sdb.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "domainName": { "kind": "path", "displayName": "Domain Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the domain currently worked with." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ses.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ses.json
index 6e03861..4a84c55 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ses.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-ses.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which SES client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "from": { "kind": "path", "displayName": "From", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The sender's email address." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-sns.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-sns.json
index 88ae7a4..e4cc818 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-sns.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-sns.json
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which SNS client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "topicNameOrArn": { "kind": "path", "displayName": "Topic Name Or Arn", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Topic name or ARN" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-translate.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-translate.json
index cb7da3c..aa1c45b 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-translate.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws-translate.json
@@ -4,7 +4,7 @@
     "scheme": "aws-translate",
     "syntax": "aws-translate:label",
     "title": "AWS Translate",
-    "description": "The aws-kms is used for managing Amazon Translate",
+    "description": "The aws-translate component is used for managing Amazon Translate",
     "label": "cloud,management",
     "deprecated": false,
     "deprecationNote": "",
@@ -24,8 +24,7 @@
     "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Amazon AWS Secret Key" },
     "region": { "kind": "property", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The region in which Translate client needs to work" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Logical name" },
@@ -38,6 +37,8 @@
     "proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol", "group": "producer", "required": false, "type": "object", "javaType": "com.amazonaws.Protocol", "enum": [ "HTTP", "HTTPS" ], "deprecated": false, "secret": false, "defaultValue": "HTTPS", "configurationClass": "org.apache.camel.component.aws.translate.TranslateConfiguration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the Translate client" },
     "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.translate.TranslateConfiguration", "configurationField": "configuration", "description": "The region in which Translate client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example A [...]
     "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws.translate.TranslateConfiguration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" },
+    "sourceLanguage": { "kind": "parameter", "displayName": "Source Language", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.translate.TranslateConfiguration", "configurationField": "configuration", "description": "Source language to use" },
+    "targetLanguage": { "kind": "parameter", "displayName": "Target Language", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.translate.TranslateConfiguration", "configurationField": "configuration", "description": "Target language to use" },
     "translateClient": { "kind": "parameter", "displayName": "Translate Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.amazonaws.services.translate.AmazonTranslate", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws.translate.TranslateConfiguration", "configurationField": "configuration", "description": "To use a existing configured AWS Translate as client" },
     "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)." }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean-validator.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean-validator.json
index b88d39d..4cedac9 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean-validator.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean-validator.json
@@ -25,8 +25,7 @@
     "traversableResolver": { "kind": "property", "displayName": "Traversable Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.TraversableResolver", "deprecated": false, "secret": false, "description": "To use a custom TraversableResolver" },
     "constraintValidatorFactory": { "kind": "property", "displayName": "Constraint Validator Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.validation.ConstraintValidatorFactory", "deprecated": false, "secret": false, "description": "To use a custom ConstraintValidatorFactory" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "label": { "kind": "path", "displayName": "Label", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Where label is an arbitrary text value describing the endpoint" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean.json
index 4735902..c6b3f02 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bean.json
@@ -19,18 +19,19 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
-    "cache": { "kind": "property", "displayName": "Cache", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope." },
+    "cache": { "kind": "property", "displayName": "Cache", "group": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true, "secret": false, "defaultValue": true, "description": "Use singleton option instead." },
+    "scope": { "kind": "property", "displayName": "Scope", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.BeanScope", "enum": [ "Singleton", "Request", "Prototype" ], "deprecated": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case concurrent threads is  [...]
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "beanName": { "kind": "path", "displayName": "Bean Name", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of the bean to invoke" },
-    "cache": { "kind": "parameter", "displayName": "Cache", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope." },
+    "cache": { "kind": "parameter", "displayName": "Cache", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true, "secret": false, "description": "Use scope option instead." },
     "method": { "kind": "parameter", "displayName": "Method", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of the method to invoke on the bean" },
-    "parameters": { "kind": "parameter", "displayName": "Parameters", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "bean.", "multiValue": true, "deprecated": false, "secret": false, "description": "Used for configuring additional properties on the bean" },
+    "scope": { "kind": "parameter", "displayName": "Scope", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.apache.camel.BeanScope", "enum": [ "Singleton", "Request", "Prototype" ], "deprecated": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case conc [...]
     "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" },
+    "parameters": { "kind": "parameter", "displayName": "Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "bean.", "multiValue": true, "deprecated": false, "secret": false, "description": "Used for configuring additional properties on the bean" },
     "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)." }
   }
 }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bonita.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bonita.json
index 41ef430..330f273 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bonita.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/bonita.json
@@ -9,8 +9,8 @@
     "deprecated": false,
     "deprecationNote": "",
     "async": false,
-    "consumerOnly": true,
-    "producerOnly": false,
+    "consumerOnly": false,
+    "producerOnly": true,
     "lenientProperties": false,
     "javaType": "org.apache.camel.component.bonita.BonitaComponent",
     "firstVersion": "2.19.0",
@@ -20,17 +20,14 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
-    "operation": { "kind": "path", "displayName": "Operation", "group": "consumer", "required": true, "type": "object", "javaType": "org.apache.camel.component.bonita.util.BonitaOperation", "enum": [ "startCase" ], "deprecated": false, "secret": false, "description": "Operation to use" },
-    "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
-    "hostname": { "kind": "parameter", "displayName": "Hostname", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "localhost", "configurationClass": "org.apache.camel.component.bonita.BonitaConfiguration", "configurationField": "configuration", "description": "Hostname where Bonita engine runs" },
-    "port": { "kind": "parameter", "displayName": "Port", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "8080", "configurationClass": "org.apache.camel.component.bonita.BonitaConfiguration", "configurationField": "configuration", "description": "Port of the server hosting Bonita engine" },
-    "processName": { "kind": "parameter", "displayName": "Process Name", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.bonita.BonitaConfiguration", "configurationField": "configuration", "description": "Name of the process involved in the operation" },
-    "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." },
+    "operation": { "kind": "path", "displayName": "Operation", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.bonita.util.BonitaOperation", "enum": [ "startCase" ], "deprecated": false, "secret": false, "description": "Operation to use" },
+    "hostname": { "kind": "parameter", "displayName": "Hostname", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "localhost", "configurationClass": "org.apache.camel.component.bonita.BonitaConfiguration", "configurationField": "configuration", "description": "Hostname where Bonita engine runs" },
+    "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  [...]
+    "port": { "kind": "parameter", "displayName": "Port", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "8080", "configurationClass": "org.apache.camel.component.bonita.BonitaConfiguration", "configurationField": "configuration", "description": "Port of the server hosting Bonita engine" },
+    "processName": { "kind": "parameter", "displayName": "Process Name", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.bonita.BonitaConfiguration", "configurationField": "configuration", "description": "Name of the process involved in the operation" },
     "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)." },
     "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.bonita.BonitaConfiguration", "configurationField": "configuration", "description": "Password to authenticate to Bonita engine." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/braintree.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/braintree.json
index ef289dc..bd9167d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/braintree.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/braintree.json
@@ -20,6 +20,7 @@
   },
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.braintree.BraintreeConfiguration", "deprecated": false, "secret": false, "description": "To use the shared configuration" },
+    "logHandlerEnabled": { "kind": "property", "displayName": "Log Handler Enabled", "group": "logging", "label": "advanced,logging", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "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." },
     "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" },
     "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 [...]
     "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 [...]
@@ -43,6 +44,7 @@
     "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": "advanced,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" },
+    "logHandlerEnabled": { "kind": "parameter", "displayName": "Log Handler Enabled", "group": "logging", "label": "advanced,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 [...]
     "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 i [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
index 44719c5..7fb9650 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
@@ -10,7 +10,7 @@
     "deprecationNote": "",
     "async": false,
     "consumerOnly": false,
-    "producerOnly": false,
+    "producerOnly": true,
     "lenientProperties": false,
     "javaType": "org.apache.camel.component.caffeine.cache.CaffeineCacheComponent",
     "firstVersion": "2.20.0",
@@ -21,18 +21,14 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.caffeine.CaffeineConfiguration", "deprecated": false, "secret": false, "description": "Sets the global component configuration" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
-    "cacheName": { "kind": "path", "displayName": "Cache Name", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "the cache name" },
-    "createCacheIfNotExist": { "kind": "parameter", "displayName": "Create Cache If Not Exist", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Configure if a cache need to be created if it does exist or can't be pre-configured." },
-    "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
-    "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." },
+    "cacheName": { "kind": "path", "displayName": "Cache Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "the cache name" },
     "action": { "kind": "parameter", "displayName": "Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "To configure the default cache action. If an action is set in the message header, then the operation from the header takes precedence." },
     "cache": { "kind": "parameter", "displayName": "Cache", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.github.benmanes.caffeine.cache.Cache", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "To configure an already instantiated cache to be used" },
     "cacheLoader": { "kind": "parameter", "displayName": "Cache Loader", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.github.benmanes.caffeine.cache.CacheLoader", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "To configure a CacheLoader in case of a LoadCache use" },
+    "createCacheIfNotExist": { "kind": "parameter", "displayName": "Create Cache If Not Exist", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Configure if a cache need to be created if it does exist or can't be pre-configured." },
     "evictionType": { "kind": "parameter", "displayName": "Eviction Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.caffeine.EvictionType", "enum": [ "SIZE_BASED", "TIME_BASED" ], "deprecated": false, "secret": false, "defaultValue": "SIZE_BASED", "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Set the eviction Type for th [...]
     "expireAfterAccessTime": { "kind": "parameter", "displayName": "Expire After Access Time", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 300, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Set the expire After Access Time in case of time based Eviction (in seconds)" },
     "expireAfterWriteTime": { "kind": "parameter", "displayName": "Expire After Write Time", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 300, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Set the expire After Access Write in case of time based Eviction (in seconds)" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
index 1de5486..4891d3c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
@@ -10,7 +10,7 @@
     "deprecationNote": "",
     "async": false,
     "consumerOnly": false,
-    "producerOnly": false,
+    "producerOnly": true,
     "lenientProperties": false,
     "javaType": "org.apache.camel.component.caffeine.load.CaffeineLoadCacheComponent",
     "firstVersion": "2.20.0",
@@ -21,18 +21,14 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.caffeine.CaffeineConfiguration", "deprecated": false, "secret": false, "description": "Sets the global component configuration" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
-    "cacheName": { "kind": "path", "displayName": "Cache Name", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "the cache name" },
-    "createCacheIfNotExist": { "kind": "parameter", "displayName": "Create Cache If Not Exist", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Configure if a cache need to be created if it does exist or can't be pre-configured." },
-    "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
-    "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." },
+    "cacheName": { "kind": "path", "displayName": "Cache Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "the cache name" },
     "action": { "kind": "parameter", "displayName": "Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "To configure the default cache action. If an action is set in the message header, then the operation from the header takes precedence." },
     "cache": { "kind": "parameter", "displayName": "Cache", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.github.benmanes.caffeine.cache.Cache", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "To configure an already instantiated cache to be used" },
     "cacheLoader": { "kind": "parameter", "displayName": "Cache Loader", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "com.github.benmanes.caffeine.cache.CacheLoader", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "To configure a CacheLoader in case of a LoadCache use" },
+    "createCacheIfNotExist": { "kind": "parameter", "displayName": "Create Cache If Not Exist", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Configure if a cache need to be created if it does exist or can't be pre-configured." },
     "evictionType": { "kind": "parameter", "displayName": "Eviction Type", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.caffeine.EvictionType", "enum": [ "SIZE_BASED", "TIME_BASED" ], "deprecated": false, "secret": false, "defaultValue": "SIZE_BASED", "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Set the eviction Type for th [...]
     "expireAfterAccessTime": { "kind": "parameter", "displayName": "Expire After Access Time", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 300, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Set the expire After Access Time in case of time based Eviction (in seconds)" },
     "expireAfterWriteTime": { "kind": "parameter", "displayName": "Expire After Write Time", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 300, "configurationClass": "org.apache.camel.component.caffeine.CaffeineConfiguration", "configurationField": "configuration", "description": "Set the expire After Access Write in case of time based Eviction (in seconds)" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/chatscript.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/chatscript.json
index d8a99e0..0991953 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/chatscript.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/chatscript.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Hostname or IP of the server on which CS server is running" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/chunk.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/chunk.json
index 84fbf3f..d730656 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/chunk.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/chunk.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/class.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/class.json
index 0ba5127..a16adb4 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/class.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/class.json
@@ -4,7 +4,7 @@
     "scheme": "class",
     "syntax": "class:beanName",
     "title": "Class",
-    "description": "The class component is for invoking Java classes (Java beans) from Camel.",
+    "description": "The Class component is for invoking Java classes (Java beans) from Camel.",
     "label": "core,java",
     "deprecated": false,
     "deprecationNote": "",
@@ -19,18 +19,19 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
-    "cache": { "kind": "property", "displayName": "Cache", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope." },
+    "cache": { "kind": "property", "displayName": "Cache", "group": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true, "secret": false, "defaultValue": true, "description": "Use singleton option instead." },
+    "scope": { "kind": "property", "displayName": "Scope", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.BeanScope", "enum": [ "Singleton", "Request", "Prototype" ], "deprecated": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case concurrent threads is  [...]
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "beanName": { "kind": "path", "displayName": "Bean Name", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of the bean to invoke" },
-    "cache": { "kind": "parameter", "displayName": "Cache", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "description": "If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope." },
+    "cache": { "kind": "parameter", "displayName": "Cache", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true, "secret": false, "description": "Use scope option instead." },
     "method": { "kind": "parameter", "displayName": "Method", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of the method to invoke on the bean" },
-    "parameters": { "kind": "parameter", "displayName": "Parameters", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "bean.", "multiValue": true, "deprecated": false, "secret": false, "description": "Used for configuring additional properties on the bean" },
+    "scope": { "kind": "parameter", "displayName": "Scope", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.apache.camel.BeanScope", "enum": [ "Singleton", "Request", "Prototype" ], "deprecated": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case conc [...]
     "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" },
+    "parameters": { "kind": "parameter", "displayName": "Parameters", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "bean.", "multiValue": true, "deprecated": false, "secret": false, "description": "Used for configuring additional properties on the bean" },
     "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)." }
   }
 }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cm-sms.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cm-sms.json
index 825bd1a..1282a68 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cm-sms.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cm-sms.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "SMS Provider HOST with scheme" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap+tcp.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap+tcp.json
index b31572f..246bc46 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap+tcp.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap+tcp.json
@@ -32,6 +32,7 @@
     "privateKey": { "kind": "parameter", "displayName": "Private Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.PrivateKey", "deprecated": false, "secret": false, "description": "Set the configured private key for use with Raw Public Key." },
     "pskStore": { "kind": "parameter", "displayName": "Psk Store", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.californium.scandium.dtls.pskstore.PskStore", "deprecated": false, "secret": false, "description": "Set the PskStore to use for pre-shared key." },
     "publicKey": { "kind": "parameter", "displayName": "Public Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.PublicKey", "deprecated": false, "secret": false, "description": "Set the configured public key for use with Raw Public Key." },
+    "recommendedCipherSuitesOnly": { "kind": "parameter", "displayName": "Recommended Cipher Suites Only", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "The CBC cipher suites are not recommended. If you want to use them, you first need to set the recommendedCipherSuitesOnly option to false." },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "Set the SSLContextParameters object for setting up TLS. This is required for coapstcp, and for coaps when we are using certificates for TLS (as opposed to RPK or PKS)." },
     "trustedRpkStore": { "kind": "parameter", "displayName": "Trusted Rpk Store", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.californium.scandium.dtls.rpkstore.TrustedRpkStore", "deprecated": false, "secret": false, "description": "Set the TrustedRpkStore to use to determine trust in raw public keys." },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap.json
index d3a592d..d944573 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coap.json
@@ -32,6 +32,7 @@
     "privateKey": { "kind": "parameter", "displayName": "Private Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.PrivateKey", "deprecated": false, "secret": false, "description": "Set the configured private key for use with Raw Public Key." },
     "pskStore": { "kind": "parameter", "displayName": "Psk Store", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.californium.scandium.dtls.pskstore.PskStore", "deprecated": false, "secret": false, "description": "Set the PskStore to use for pre-shared key." },
     "publicKey": { "kind": "parameter", "displayName": "Public Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.PublicKey", "deprecated": false, "secret": false, "description": "Set the configured public key for use with Raw Public Key." },
+    "recommendedCipherSuitesOnly": { "kind": "parameter", "displayName": "Recommended Cipher Suites Only", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "The CBC cipher suites are not recommended. If you want to use them, you first need to set the recommendedCipherSuitesOnly option to false." },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "Set the SSLContextParameters object for setting up TLS. This is required for coapstcp, and for coaps when we are using certificates for TLS (as opposed to RPK or PKS)." },
     "trustedRpkStore": { "kind": "parameter", "displayName": "Trusted Rpk Store", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.californium.scandium.dtls.rpkstore.TrustedRpkStore", "deprecated": false, "secret": false, "description": "Set the TrustedRpkStore to use to determine trust in raw public keys." },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps+tcp.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps+tcp.json
index efc2ab0..720c895 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps+tcp.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps+tcp.json
@@ -32,6 +32,7 @@
     "privateKey": { "kind": "parameter", "displayName": "Private Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.PrivateKey", "deprecated": false, "secret": false, "description": "Set the configured private key for use with Raw Public Key." },
     "pskStore": { "kind": "parameter", "displayName": "Psk Store", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.californium.scandium.dtls.pskstore.PskStore", "deprecated": false, "secret": false, "description": "Set the PskStore to use for pre-shared key." },
     "publicKey": { "kind": "parameter", "displayName": "Public Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.PublicKey", "deprecated": false, "secret": false, "description": "Set the configured public key for use with Raw Public Key." },
+    "recommendedCipherSuitesOnly": { "kind": "parameter", "displayName": "Recommended Cipher Suites Only", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "The CBC cipher suites are not recommended. If you want to use them, you first need to set the recommendedCipherSuitesOnly option to false." },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "Set the SSLContextParameters object for setting up TLS. This is required for coapstcp, and for coaps when we are using certificates for TLS (as opposed to RPK or PKS)." },
     "trustedRpkStore": { "kind": "parameter", "displayName": "Trusted Rpk Store", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.californium.scandium.dtls.rpkstore.TrustedRpkStore", "deprecated": false, "secret": false, "description": "Set the TrustedRpkStore to use to determine trust in raw public keys." },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps.json
index 0d860d6..d43ef4e 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/coaps.json
@@ -32,6 +32,7 @@
     "privateKey": { "kind": "parameter", "displayName": "Private Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.PrivateKey", "deprecated": false, "secret": false, "description": "Set the configured private key for use with Raw Public Key." },
     "pskStore": { "kind": "parameter", "displayName": "Psk Store", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.californium.scandium.dtls.pskstore.PskStore", "deprecated": false, "secret": false, "description": "Set the PskStore to use for pre-shared key." },
     "publicKey": { "kind": "parameter", "displayName": "Public Key", "group": "common", "required": false, "type": "object", "javaType": "java.security.PublicKey", "deprecated": false, "secret": false, "description": "Set the configured public key for use with Raw Public Key." },
+    "recommendedCipherSuitesOnly": { "kind": "parameter", "displayName": "Recommended Cipher Suites Only", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "The CBC cipher suites are not recommended. If you want to use them, you first need to set the recommendedCipherSuitesOnly option to false." },
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "Set the SSLContextParameters object for setting up TLS. This is required for coapstcp, and for coaps when we are using certificates for TLS (as opposed to RPK or PKS)." },
     "trustedRpkStore": { "kind": "parameter", "displayName": "Trusted Rpk Store", "group": "common", "required": false, "type": "object", "javaType": "org.eclipse.californium.scandium.dtls.rpkstore.TrustedRpkStore", "deprecated": false, "secret": false, "description": "Set the TrustedRpkStore to use to determine trust in raw public keys." },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
index 4092d88..318e2cf 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/consul.json
@@ -33,12 +33,33 @@
   },
   "properties": {
     "apiEndpoint": { "kind": "path", "displayName": "Api Endpoint", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The API endpoint" },
+    "connectTimeoutMillis": { "kind": "parameter", "displayName": "Connect Timeout Millis", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Connect timeout for OkHttpClient" },
+    "consulClient": { "kind": "parameter", "displayName": "Consul Client", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "com.orbitz.consul.Consul", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Reference to a com.orbitz.consul.Consul in the registry." },
+    "key": { "kind": "parameter", "displayName": "Key", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default key. Can be overridden by CamelConsulKey" },
+    "pingInstance": { "kind": "parameter", "displayName": "Ping Instance", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Configure if the AgentClient should attempt a ping before returning the Consul instance" },
+    "readTimeoutMillis": { "kind": "parameter", "displayName": "Read Timeout Millis", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Read timeout for OkHttpClient" },
+    "tags": { "kind": "parameter", "displayName": "Tags", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Set tags. You can separate multiple tags by comma." },
+    "url": { "kind": "parameter", "displayName": "Url", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The Consul agent URL" },
+    "writeTimeoutMillis": { "kind": "parameter", "displayName": "Write Timeout Millis", "group": "common", "required": false, "type": "integer", "javaType": "java.lang.Long", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Write timeout for OkHttpClient" },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "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." },
+    "action": { "kind": "parameter", "displayName": "Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The default action. Can be overridden by CamelConsulAction" },
     "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  [...]
+    "valueAsString": { "kind": "parameter", "displayName": "Value As String", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "Default to transform values retrieved from Consul i.e. on KV endpoint to string." },
     "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)." }
+    "consistencyMode": { "kind": "parameter", "displayName": "Consistency Mode", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.orbitz.consul.option.ConsistencyMode", "enum": [ "DEFAULT", "STALE", "CONSISTENT" ], "deprecated": false, "secret": false, "defaultValue": "DEFAULT", "configurationClass": "org.apache.camel.component.consul.ConsulConfiguration", "configurationField": "configuration", "description": "The consistencyMode used for qu [...]
+    "datacenter": { "kind": "parameter", "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": "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" }
   }
 }
 
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
index c5a428b..8dd1493 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/controlbus.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "command": { "kind": "path", "displayName": "Command", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "route", "language" ], "deprecated": false, "secret": false, "description": "Command can be either route or language" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
index 65ef496..f82b53b 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/corda.json
@@ -2,9 +2,9 @@
  "component": {
     "kind": "component",
     "scheme": "corda",
-    "syntax": "corda:configuration",
+    "syntax": "corda:node",
     "title": "Corda",
-    "description": "The corda component uses the corda-rpc to interact with corda nodes.",
+    "description": "The corda component uses corda-rpc to interact with corda nodes.",
     "label": "corda,blockchain",
     "deprecated": false,
     "deprecationNote": "",
@@ -19,19 +19,22 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
-    "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.corda.CordaConfiguration", "deprecated": false, "secret": false, "description": "Default configuration" },
+    "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.corda.CordaConfiguration", "deprecated": false, "secret": false, "description": "To use a shared configuration." },
     "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" },
     "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 [...]
     "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 [...]
   },
   "properties": {
-    "configuration": { "kind": "path", "displayName": "Configuration", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.component.corda.CordaConfiguration", "deprecated": false, "secret": false, "description": "URL to the corda node" },
+    "node": { "kind": "path", "displayName": "Node", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The url for the corda node" },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "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  [...]
+    "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.corda.CordaConfiguration", "configurationField": "configuration", "description": "Operation to use" },
     "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)." }
+    "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)." },
+    "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.corda.CordaConfiguration", "configurationField": "configuration", "description": "Password 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.corda.CordaConfiguration", "configurationField": "configuration", "description": "Username for login" }
   }
 }
 
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
index 42ed24e..96ba138 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cql.json
@@ -4,7 +4,7 @@
     "scheme": "cql",
     "syntax": "cql:beanRef:hosts:port/keyspace",
     "title": "Cassandra CQL",
-    "description": "The cql component aims at integrating Cassandra 2.0 using the CQL3 API (not the Thrift API).",
+    "description": "The cql component aims at integrating Cassandra 2.0 using the CQL3 API (not the Thrift API). It's based on Cassandra Java Driver provided by DataStax.",
     "label": "database,nosql",
     "deprecated": false,
     "deprecationNote": "",
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/crypto-cms.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/crypto-cms.json
index 58c647d..e0dc61d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/crypto-cms.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/crypto-cms.json
@@ -6,7 +6,7 @@
     "title": "Crypto CMS",
     "description": "The crypto cms component is used for encrypting data in CMS Enveloped Data format, decrypting CMS Enveloped Data, signing data in CMS Signed Data format, and verifying CMS Signed Data.",
     "label": "security,transformation",
-    "deprecated": false,
+    "deprecated": true,
     "deprecationNote": "",
     "async": false,
     "consumerOnly": false,
@@ -22,8 +22,7 @@
     "signedDataVerifierConfiguration": { "kind": "property", "displayName": "Signed Data Verifier Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.crypto.cms.sig.SignedDataVerifierConfiguration", "deprecated": false, "secret": false, "description": "To configure the shared SignedDataVerifierConfiguration, which determines the uri parameters for the verify operation." },
     "envelopedDataDecryptorConfiguration": { "kind": "property", "displayName": "Enveloped Data Decryptor Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.crypto.cms.crypt.EnvelopedDataDecryptorConfiguration", "deprecated": false, "secret": false, "description": "To configure the shared EnvelopedDataDecryptorConfiguration, which determines the uri parameters for the decrypt operation." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "cryptoOperation": { "kind": "path", "displayName": "Crypto Operation", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.crypto.cms.CryptoOperation", "enum": [ "sign", "verify", "encrypt", "decrypt" ], "deprecated": false, "secret": false, "description": "Set the Crypto operation from that supplied after the crypto scheme in the endpoint uri e.g. crypto-cms:sign sets sign as the operation. Possible values: sign, verify, encrypt, or decr [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/crypto.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/crypto.json
index f0f3a87..857d038 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/crypto.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/crypto.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.crypto.DigitalSignatureConfiguration", "deprecated": false, "secret": false, "description": "To use the shared DigitalSignatureConfiguration as configuration" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "cryptoOperation": { "kind": "path", "displayName": "Crypto Operation", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.crypto.CryptoOperation", "enum": [ "sign", "verify" ], "deprecated": false, "secret": false, "description": "Set the Crypto operation from that supplied after the crypto scheme in the endpoint uri e.g. crypto:sign sets sign as the operation." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
index 2d9cae5..4b2bd83 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxf.json
@@ -34,7 +34,7 @@
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "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." },
-    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
+    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
     "defaultOperationName": { "kind": "parameter", "displayName": "Default Operation Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This option will set the default operationName that will be used by the CxfProducer which invokes the remote service." },
     "defaultOperationNamespace": { "kind": "parameter", "displayName": "Default Operation Namespace", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This option will set the default operationNamespace that will be used by the CxfProducer which invokes the remote service." },
     "hostnameVerifier": { "kind": "parameter", "displayName": "Hostname Verifier", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "secret": false, "description": "The hostname verifier to be used. Use the # notation to reference a HostnameVerifier from the registry." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
index b8e5fea..84497b2 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/cxfrs.json
@@ -42,7 +42,7 @@
     "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." },
     "serviceBeans": { "kind": "parameter", "displayName": "Service Beans", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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" },
-    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
+    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
     "hostnameVerifier": { "kind": "parameter", "displayName": "Hostname Verifier", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "javax.net.ssl.HostnameVerifier", "deprecated": false, "secret": false, "description": "The hostname verifier to be used. Use the # notation to reference a HostnameVerifier from the registry." },
     "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  [...]
     "sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context Parameters", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false, "secret": false, "description": "The Camel SSL setting reference. Use the # notation to reference the SSL Context." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataformat.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataformat.json
index e3d962a..12fbf98 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataformat.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataformat.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of data format" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset-test.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset-test.json
index 7773d77..e4c227c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset-test.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset-test.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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"},
-    "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 route to fail being sta [...]
-    "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 the routing Error Han [...]
+    "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 route to fail being sta [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of endpoint to lookup in the registry to use for polling messages used for testing" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json
index 0e5d759..7972de0 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dataset.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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"},
-    "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 route to fail being sta [...]
-    "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 the routing Error Han [...]
+    "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 route to fail being sta [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.component.dataset.DataSet", "deprecated": false, "secret": false, "description": "Name of DataSet to lookup in the registry" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
index a6a308e..0d5008f 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mongodb.json
@@ -21,7 +21,6 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.debezium.configuration.MongoDbConnectorEmbeddedDebeziumConfiguration", "deprecated": false, "secret": false, "description": "Allow pre-configured Configurations to be set." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mysql.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mysql.json
index c15cd25..0d2cbdd 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mysql.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-mysql.json
@@ -21,7 +21,6 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.debezium.configuration.MySqlConnectorEmbeddedDebeziumConfiguration", "deprecated": false, "secret": false, "description": "Allow pre-configured Configurations to be set." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-postgres.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-postgres.json
index 66a3265..e5e31eb 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-postgres.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-postgres.json
@@ -21,7 +21,6 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration", "deprecated": false, "secret": false, "description": "Allow pre-configured Configurations to be set." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
@@ -62,6 +61,7 @@
     "heartbeatTopicsPrefix": { "kind": "parameter", "displayName": "Heartbeat Topics Prefix", "group": "postgres", "label": "consumer,postgres", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "__debezium-heartbeat", "configurationClass": "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "The prefix that is used [...]
     "hstoreHandlingMode": { "kind": "parameter", "displayName": "Hstore Handling Mode", "group": "postgres", "label": "consumer,postgres", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "json", "configurationClass": "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Specify how HSTORE columns should be represen [...]
     "includeUnknownDatatypes": { "kind": "parameter", "displayName": "Include Unknown Datatypes", "group": "postgres", "label": "consumer,postgres", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Specify whether the fields of data type not  [...]
+    "intervalHandlingMode": { "kind": "parameter", "displayName": "Interval Handling Mode", "group": "postgres", "label": "consumer,postgres", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "numeric", "configurationClass": "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Specify how INTERVAL columns should be [...]
     "maxBatchSize": { "kind": "parameter", "displayName": "Max Batch Size", "group": "postgres", "label": "consumer,postgres", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 2048, "configurationClass": "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Maximum size of each batch of source records. Defaults to 2048." },
     "maxQueueSize": { "kind": "parameter", "displayName": "Max Queue Size", "group": "postgres", "label": "consumer,postgres", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 8192, "configurationClass": "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Maximum size of the queue for change events read from the database log  [...]
     "messageKeyColumns": { "kind": "parameter", "displayName": "Message Key Columns", "group": "postgres", "label": "consumer,postgres", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.debezium.configuration.PostgresConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "A semicolon-separated list of expressions that match fully-qualified ta [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-sqlserver.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-sqlserver.json
index a4e8568..6d61685 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-sqlserver.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/debezium-sqlserver.json
@@ -21,7 +21,6 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "deprecated": false, "secret": false, "description": "Allow pre-configured Configurations to be set." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
@@ -53,6 +52,7 @@
     "databasePassword": { "kind": "parameter", "displayName": "Database Password", "group": "sqlserver", "label": "consumer,sqlserver", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Password of the SQL Server database user to be used when connecting to t [...]
     "databasePort": { "kind": "parameter", "displayName": "Database Port", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1433, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Port of the SQL Server database server." },
     "databaseServerName": { "kind": "parameter", "displayName": "Database Server Name", "group": "sqlserver", "label": "consumer,sqlserver", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Unique name that identifies the database server and all recorded of [...]
+    "databaseServerTimezone": { "kind": "parameter", "displayName": "Database Server Timezone", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "The timezone of the server used to correctly shift the com [...]
     "databaseUser": { "kind": "parameter", "displayName": "Database User", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Name of the SQL Server database user to be used when connecting to the database." },
     "decimalHandlingMode": { "kind": "parameter", "displayName": "Decimal Handling Mode", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "precise", "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Specify how DECIMAL and NUMERIC colum [...]
     "heartbeatIntervalMs": { "kind": "parameter", "displayName": "Heartbeat Interval Ms", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 0, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Length of an interval in milli-seconds in in which the co [...]
@@ -64,13 +64,14 @@
     "snapshotDelayMs": { "kind": "parameter", "displayName": "Snapshot Delay Ms", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 0, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "The number of milliseconds to delay before a snapshot will begin." },
     "snapshotFetchSize": { "kind": "parameter", "displayName": "Snapshot Fetch Size", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "The maximum number of records that should be loaded into memory while performing [...]
     "snapshotLockTimeoutMs": { "kind": "parameter", "displayName": "Snapshot Lock Timeout Ms", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 10000, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "The maximum number of millis to wait for table  [...]
-    "snapshotMode": { "kind": "parameter", "displayName": "Snapshot Mode", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "initial", "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "The criteria for running a snapshot upon startup of  [...]
+    "snapshotMode": { "kind": "parameter", "displayName": "Snapshot Mode", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "initial", "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "The criteria for running a snapshot upon startup of  [...]
     "snapshotSelectStatementOverrides": { "kind": "parameter", "displayName": "Snapshot Select Statement Overrides", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "This property contains a comma-separa [...]
     "sourceStructVersion": { "kind": "parameter", "displayName": "Source Struct Version", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "v2", "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "A version of the format of the publicly vi [...]
     "tableBlacklist": { "kind": "parameter", "displayName": "Table Blacklist", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Description is not available here, please check Debezium website for corres [...]
     "tableIgnoreBuiltin": { "kind": "parameter", "displayName": "Table Ignore Builtin", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Flag specifying whether built-in tables should be ig [...]
     "tableWhitelist": { "kind": "parameter", "displayName": "Table Whitelist", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "The tables for which changes are to be captured" },
-    "timePrecisionMode": { "kind": "parameter", "displayName": "Time Precision Mode", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "adaptive", "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Time, date, and timestamps can be repres [...]
+    "timePrecisionMode": { "kind": "parameter", "displayName": "Time Precision Mode", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "adaptive", "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Time, date, and timestamps can be repres [...]
+    "tombstonesOnDelete": { "kind": "parameter", "displayName": "Tombstones On Delete", "group": "sqlserver", "label": "consumer,sqlserver", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.debezium.configuration.SqlServerConnectorEmbeddedDebeziumConfiguration", "configurationField": "configuration", "description": "Whether delete operations should be represented by  [...]
   }
 }
 
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/digitalocean.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/digitalocean.json
index f97c5aa..0f9b8cb 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/digitalocean.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/digitalocean.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "operation": { "kind": "path", "displayName": "Operation", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.digitalocean.constants.DigitalOceanOperations", "enum": [ "create", "update", "delete", "list", "ownList", "get", "listBackups", "listActions", "listNeighbors", "listSnapshots", "listKernels", "listAllNeighbors", "enableBackups", "disableBackups", "reboot", "powerCycle", "shutdown", "powerOn", "powerOff", "restore", "resetPasswor [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dns.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dns.json
index d1fde84..a6c73fc 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dns.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dns.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "dnsType": { "kind": "path", "displayName": "Dns Type", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.dns.DnsType", "enum": [ "dig", "ip", "lookup", "wikipedia" ], "deprecated": false, "secret": false, "description": "The type of the lookup." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dozer.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dozer.json
index 0191f6e..79d211d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dozer.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/dozer.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "A human readable name of the mapping." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/drill.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/drill.json
index 2b55cb8..55396ca 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/drill.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/drill.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "ZooKeeper host name or IP address. Use local instead of a host name or IP address to connect to the local Drillbit" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ehcache.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ehcache.json
index ccb4b0a..fceb2ed 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ehcache.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ehcache.json
@@ -38,7 +38,7 @@
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "eventFiring": { "kind": "parameter", "displayName": "Event Firing", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.ehcache.event.EventFiring", "enum": [ "ASYNCHRONOUS", "SYNCHRONOUS" ], "deprecated": false, "secret": false, "defaultValue": "ASYNCHRONOUS", "configurationClass": "org.apache.camel.component.ehcache.EhcacheConfiguration", "configurationField": "configuration", "description": "Set the delivery mode (synchronous, asynchronous)" },
     "eventOrdering": { "kind": "parameter", "displayName": "Event Ordering", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.ehcache.event.EventOrdering", "enum": [ "UNORDERED", "ORDERED" ], "deprecated": false, "secret": false, "defaultValue": "ORDERED", "configurationClass": "org.apache.camel.component.ehcache.EhcacheConfiguration", "configurationField": "configuration", "description": "Set the delivery mode (ordered, unordered)" },
-    "eventTypes": { "kind": "parameter", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "java.util.Set<org.ehcache.event.EventType>", "enum": [ "EVICTED", "EXPIRED", "REMOVED", "CREATED", "UPDATED" ], "deprecated": false, "secret": false, "defaultValue": "EVICTED,EXPIRED,REMOVED,CREATED,UPDATED", "configurationClass": "org.apache.camel.component.ehcache.EhcacheConfiguration", "configurationField": "configuration",  [...]
+    "eventTypes": { "kind": "parameter", "displayName": "Event Types", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "EVICTED", "EXPIRED", "REMOVED", "CREATED", "UPDATED" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.ehcache.EhcacheConfiguration", "configurationField": "configuration", "description": "Set the type of events to listen for (EVICTED,EXPIRED,REMOVED,CREATED [...]
     "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." },
     "action": { "kind": "parameter", "displayName": "Action", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.ehcache.EhcacheConfiguration", "configurationField": "configuration", "description": "To configure the default cache action. If an action is set in the message header, then the operation from the header takes precedence." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest.json
index d05d0bb..a185291 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elasticsearch-rest.json
@@ -31,13 +31,13 @@
     "snifferInterval": { "kind": "property", "displayName": "Sniffer Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 300000, "description": "The interval between consecutive ordinary sniff executions in milliseconds. Will be honoured when sniffOnFailure is disabled or when there are no failures between consecutive sniff executions" },
     "sniffAfterFailureDelay": { "kind": "property", "displayName": "Sniff After Failure Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 60000, "description": "The delay of a sniff execution scheduled after a failure (in milliseconds)" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "clusterName": { "kind": "path", "displayName": "Cluster Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of the cluster" },
     "connectionTimeout": { "kind": "parameter", "displayName": "Connection Timeout", "group": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The time in ms to wait before connection will timeout." },
     "disconnect": { "kind": "parameter", "displayName": "Disconnect", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Disconnect after it finish calling the producer" },
+    "enableSniffer": { "kind": "parameter", "displayName": "Enable Sniffer", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable automatically discover nodes from a running Elasticsearch cluster" },
     "enableSSL": { "kind": "parameter", "displayName": "Enable SSL", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable SSL" },
     "hostAddresses": { "kind": "parameter", "displayName": "Host Addresses", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Comma separated list with ip:port formatted remote transport addresses to use." },
     "indexName": { "kind": "parameter", "displayName": "Index Name", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The name of the index to act against" },
@@ -45,6 +45,8 @@
     "maxRetryTimeout": { "kind": "parameter", "displayName": "Max Retry Timeout", "group": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The time in ms before retry" },
     "operation": { "kind": "parameter", "displayName": "Operation", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.elasticsearch.ElasticsearchOperation", "enum": [ "Index", "Update", "Bulk", "BulkIndex", "GetById", "MultiGet", "MultiSearch", "Delete", "DeleteIndex", "Search", "Exists", "Ping" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configuratio [...]
     "scrollKeepAliveMs": { "kind": "parameter", "displayName": "Scroll Keep Alive Ms", "group": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 60000, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Time in ms during which elasticsearch will keep search context alive" },
+    "sniffAfterFailureDelay": { "kind": "parameter", "displayName": "Sniff After Failure Delay", "group": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 60000, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The delay of a sniff execution scheduled after a failure (in milliseconds)" },
+    "snifferInterval": { "kind": "parameter", "displayName": "Sniffer Interval", "group": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 300000, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The interval between consecutive ordinary sniff executions in milliseconds. Will be honoured when sniffOnFailure is disable [...]
     "socketTimeout": { "kind": "parameter", "displayName": "Socket Timeout", "group": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "The timeout in ms to wait before the socket will timeout." },
     "useScroll": { "kind": "parameter", "displayName": "Use Scroll", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Enable scroll usage" },
     "waitForActiveShards": { "kind": "parameter", "displayName": "Wait For Active Shards", "group": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.elasticsearch.ElasticsearchConfiguration", "configurationField": "configuration", "description": "Index creation waits for the write consistency number of shards to be available" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elsql.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elsql.json
index 4e174f2..ba255b6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elsql.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/elsql.json
@@ -47,7 +47,7 @@
     "onConsumeFailed": { "kind": "parameter", "displayName": "On Consume Failed", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "After processing each row then this query can be executed, if the Exchange failed, for example to mark the row as failed. The query can have parameter." },
     "routeEmptyResultSet": { "kind": "parameter", "displayName": "Route Empty Result Set", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether empty resultset should be allowed to be sent to the next hop. Defaults to false. So the empty resultset will be filtered out." },
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
-    "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables or disables transaction. If enabled then if processing an exchange failed then the consumerbreak out processing any further exchanges to cause a rollback eager." },
+    "transacted": { "kind": "parameter", "displayName": "Transacted", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Enables or disables transaction. If enabled then if processing an exchange failed then the consumer breaks out processing any further exchanges to cause a rollback eager." },
     "useIterator": { "kind": "parameter", "displayName": "Use Iterator", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Sets how resultset should be delivered to route. Indicates delivery as either a list or individual object. defaults to true." },
     "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." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/exec.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/exec.json
index 07c44a6..b1298f5 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/exec.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/exec.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "executable": { "kind": "path", "displayName": "Executable", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the executable to be executed. The executable must not be empty or null." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/file-watch.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/file-watch.json
index b11e58b..d909a5a 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/file-watch.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/file-watch.json
@@ -25,7 +25,6 @@
     "fileHasher": { "kind": "property", "displayName": "File Hasher", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "io.methvin.watcher.hashing.FileHasher", "deprecated": false, "secret": false, "defaultValue": "#murmur3FFileHasher", "description": "Reference to io.methvin.watcher.hashing.FileHasher. This prevents emitting duplicate events on some platforms. For working with large files and if you dont need detect multiple modifications per se [...]
     "useFileHashing": { "kind": "property", "displayName": "Use File Hashing", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Enables or disables file hashing to detect duplicate events. If you disable this, you can get some events multiple times on some platforms and JDKs. Check java.nio.file.WatchService limitations for your target platform." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/flink.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/flink.json
index 372cfcc..f6dddf3 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/flink.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/flink.json
@@ -24,8 +24,7 @@
     "dataSetCallback": { "kind": "property", "displayName": "Data Set Callback", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.flink.DataSetCallback", "deprecated": false, "secret": false, "description": "Function performing action against a DataSet." },
     "dataStreamCallback": { "kind": "property", "displayName": "Data Stream Callback", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.flink.DataStreamCallback", "deprecated": false, "secret": false, "description": "Function performing action against a DataStream." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "endpointType": { "kind": "path", "displayName": "Endpoint Type", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.flink.EndpointType", "enum": [ "dataset", "datastream" ], "deprecated": false, "secret": false, "description": "Type of the endpoint (dataset, datastream)." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/fop.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/fop.json
index 19c39eb..ed74925 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/fop.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/fop.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "outputType": { "kind": "path", "displayName": "Output Type", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.fop.FopOutputType", "enum": [ "pdf", "ps", "pcl", "png", "jpeg", "svg", "xml", "mif", "rtf", "txt" ], "deprecated": false, "secret": false, "description": "The primary output format is PDF but other output formats are also supported." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json
index 03dadf4..aa014e8 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/freemarker.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "freemarker.template.Configuration", "deprecated": false, "secret": false, "description": "To use an existing freemarker.template.Configuration instance as the configuration." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ganglia.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ganglia.json
index 66b2ec2..07c41e5 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ganglia.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ganglia.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.ganglia.GangliaConfiguration", "deprecated": false, "secret": false, "description": "To use the shared configuration" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "239.2.11.71", "description": "Host name for Ganglia server" },
@@ -31,7 +30,7 @@
     "groupName": { "kind": "parameter", "displayName": "Group Name", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "java", "configurationClass": "org.apache.camel.component.ganglia.GangliaConfiguration", "configurationField": "configuration", "description": "The group that the metric belongs to." },
     "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  [...]
     "metricName": { "kind": "parameter", "displayName": "Metric Name", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "metric", "configurationClass": "org.apache.camel.component.ganglia.GangliaConfiguration", "configurationField": "configuration", "description": "The name to use for the metric." },
-    "mode": { "kind": "parameter", "displayName": "Mode", "group": "producer", "required": false, "type": "object", "javaType": "info.ganglia.gmetric4j.gmetric.GMetric.UDPAddressingMode", "deprecated": false, "secret": false, "defaultValue": "MULTICAST", "configurationClass": "org.apache.camel.component.ganglia.GangliaConfiguration", "configurationField": "configuration", "description": "Send the UDP metric packets using MULTICAST or UNICAST" },
+    "mode": { "kind": "parameter", "displayName": "Mode", "group": "producer", "required": false, "type": "object", "javaType": "info.ganglia.gmetric4j.gmetric.GMetric.UDPAddressingMode", "enum": [ "MULTICAST", "UNICAST" ], "deprecated": false, "secret": false, "defaultValue": "MULTICAST", "configurationClass": "org.apache.camel.component.ganglia.GangliaConfiguration", "configurationField": "configuration", "description": "Send the UDP metric packets using MULTICAST or UNICAST" },
     "prefix": { "kind": "parameter", "displayName": "Prefix", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.ganglia.GangliaConfiguration", "configurationField": "configuration", "description": "Prefix the metric name with this string and an underscore." },
     "slope": { "kind": "parameter", "displayName": "Slope", "group": "producer", "required": false, "type": "object", "javaType": "info.ganglia.gmetric4j.gmetric.GMetricSlope", "enum": [ "ZERO", "POSITIVE", "NEGATIVE", "BOTH" ], "deprecated": false, "secret": false, "defaultValue": "BOTH", "configurationClass": "org.apache.camel.component.ganglia.GangliaConfiguration", "configurationField": "configuration", "description": "The slope" },
     "spoofHostname": { "kind": "parameter", "displayName": "Spoof Hostname", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.ganglia.GangliaConfiguration", "configurationField": "configuration", "description": "Spoofing information IP:hostname" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/geocoder.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/geocoder.json
index 6fc63b9..0a95369 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/geocoder.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/geocoder.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "address": { "kind": "path", "displayName": "Address", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The geo address which should be prefixed with address:" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-bigquery-sql.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-bigquery-sql.json
index b194c67..54fca20 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-bigquery-sql.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-bigquery-sql.json
@@ -22,8 +22,7 @@
     "projectId": { "kind": "property", "displayName": "Project Id", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Google Cloud Project Id" },
     "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory", "deprecated": false, "secret": false, "description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "query": { "kind": "path", "displayName": "Query", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "BigQuery standard SQL query" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-bigquery.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-bigquery.json
index 2092554..811d5ba 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-bigquery.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-bigquery.json
@@ -23,8 +23,7 @@
     "datasetId": { "kind": "property", "displayName": "Dataset Id", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "BigQuery Dataset Id" },
     "connectionFactory": { "kind": "property", "displayName": "Connection Factory", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory", "deprecated": false, "secret": false, "description": "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "projectId": { "kind": "path", "displayName": "Project Id", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Google Cloud Project Id" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-calendar-stream.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-calendar-stream.json
index 82d70e3..482e063 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-calendar-stream.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-calendar-stream.json
@@ -22,7 +22,6 @@
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.calendar.stream.GoogleCalendarStreamConfiguration", "deprecated": false, "secret": false, "description": "The configuration" },
     "clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.calendar.GoogleCalendarClientFactory", "deprecated": false, "secret": false, "description": "The client Factory" },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
index 046ff0e..18eed9b 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
@@ -22,7 +22,6 @@
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration", "deprecated": false, "secret": false, "description": "The configuration" },
     "clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.mail.GoogleMailClientFactory", "deprecated": false, "secret": false, "description": "The client Factory" },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
index c8eed7a..a0304a3 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-sheets-stream.json
@@ -23,7 +23,6 @@
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.sheets.stream.GoogleSheetsStreamConfiguration", "deprecated": false, "secret": false, "description": "To use the shared configuration" },
     "clientFactory": { "kind": "property", "displayName": "Client Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.google.sheets.GoogleSheetsClientFactory", "deprecated": false, "secret": false, "description": "To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory" },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/graphql.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/graphql.json
index 5186f5d..f1f2d3e 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/graphql.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/graphql.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "httpUri": { "kind": "path", "displayName": "Http Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The GraphQL server URI." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-atomicvalue.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-atomicvalue.json
index 1c2a12b..a253f99 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-atomicvalue.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-atomicvalue.json
@@ -22,8 +22,7 @@
     "hazelcastInstance": { "kind": "property", "displayName": "Hazelcast Instance", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.hazelcast.core.HazelcastInstance", "deprecated": false, "secret": false, "description": "The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance." },
     "hazelcastMode": { "kind": "property", "displayName": "Hazelcast Mode", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "node", "description": "The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "cacheName": { "kind": "path", "displayName": "Cache Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the cache" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-instance.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-instance.json
index fa9b79c..0fdec05 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-instance.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-instance.json
@@ -22,7 +22,6 @@
     "hazelcastInstance": { "kind": "property", "displayName": "Hazelcast Instance", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.hazelcast.core.HazelcastInstance", "deprecated": false, "secret": false, "description": "The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance." },
     "hazelcastMode": { "kind": "property", "displayName": "Hazelcast Mode", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "node", "description": "The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-ringbuffer.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-ringbuffer.json
index 5299b5a..d8518a5 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-ringbuffer.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-ringbuffer.json
@@ -22,8 +22,7 @@
     "hazelcastInstance": { "kind": "property", "displayName": "Hazelcast Instance", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.hazelcast.core.HazelcastInstance", "deprecated": false, "secret": false, "description": "The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance." },
     "hazelcastMode": { "kind": "property", "displayName": "Hazelcast Mode", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "node", "description": "The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "cacheName": { "kind": "path", "displayName": "Cache Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the cache" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-set.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-set.json
index 07e7d91..e23c47d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-set.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/hazelcast-set.json
@@ -4,7 +4,7 @@
     "scheme": "hazelcast-set",
     "syntax": "hazelcast-set:cacheName",
     "title": "Hazelcast Set",
-    "description": "The camel Endpoint to access Hazelcast distributed set.",
+    "description": "The hazelcast-set component is used to access Hazelcast distributed set.",
     "label": "cache,datagrid",
     "deprecated": false,
     "deprecationNote": "",
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
index 718af0d..4a8d5b6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
@@ -39,8 +39,7 @@
     "allowJavaSerializedObject": { "kind": "property", "displayName": "Allow Java Serialized Object", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming [...]
     "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." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "httpUri": { "kind": "path", "displayName": "Http Uri", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The url of the HTTP endpoint to call." },
@@ -52,13 +51,14 @@
     "clearExpiredCookies": { "kind": "parameter", "displayName": "Clear Expired Cookies", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired." },
     "connectionClose": { "kind": "parameter", "displayName": "Connection Close", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false." },
     "copyHeaders": { "kind": "parameter", "displayName": "Copy Headers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers)." },
+    "customHostHeader": { "kind": "parameter", "displayName": "Custom Host Header", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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" },
     "httpMethod": { "kind": "parameter", "displayName": "Http Method", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.HttpMethods", "enum": [ "GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS", "TRACE", "PATCH" ], "deprecated": false, "secret": false, "description": "Configure the HTTP method to use. The HttpMethod header cannot override this option if set." },
     "ignoreResponseBody": { "kind": "parameter", "displayName": "Ignore Response Body", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If this option is true, The http producer won't read response body and cache the input stream" },
     "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  [...]
     "preserveHostHeader": { "kind": "parameter", "displayName": "Preserve Host Header", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the option is true, HttpProducer will set the Host header to the value contained in the current exchange Host header, useful in reverse proxy applications where you want the Host header received by the downstream server t [...]
     "throwExceptionOnFailure": { "kind": "parameter", "displayName": "Throw Exception On Failure", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code." },
     "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "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. On the producer side the exception will be deserialized  [...]
-    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
+    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
     "cookieStore": { "kind": "parameter", "displayName": "Cookie Store", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.http.client.CookieStore", "deprecated": false, "secret": false, "description": "To use a custom CookieStore. By default the BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn' [...]
     "deleteWithBody": { "kind": "parameter", "displayName": "Delete With Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body." },
     "getWithBody": { "kind": "parameter", "displayName": "Get With Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
index 9b3c87f..460a33f 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
@@ -39,8 +39,7 @@
     "allowJavaSerializedObject": { "kind": "property", "displayName": "Allow Java Serialized Object", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming [...]
     "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." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "httpUri": { "kind": "path", "displayName": "Http Uri", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "The url of the HTTP endpoint to call." },
@@ -52,13 +51,14 @@
     "clearExpiredCookies": { "kind": "parameter", "displayName": "Clear Expired Cookies", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to clear expired cookies before sending the HTTP request. This ensures the cookies store does not keep growing by adding new cookies which is newer removed when they are expired." },
     "connectionClose": { "kind": "parameter", "displayName": "Connection Close", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Specifies whether a Connection Close header must be added to HTTP Request. By default connectionClose is false." },
     "copyHeaders": { "kind": "parameter", "displayName": "Copy Headers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "If this option is true then IN exchange headers will be copied to OUT exchange headers according to copy strategy. Setting this to false, allows to only include the headers from the HTTP response (not propagating IN headers)." },
+    "customHostHeader": { "kind": "parameter", "displayName": "Custom Host Header", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "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" },
     "httpMethod": { "kind": "parameter", "displayName": "Http Method", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.HttpMethods", "enum": [ "GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS", "TRACE", "PATCH" ], "deprecated": false, "secret": false, "description": "Configure the HTTP method to use. The HttpMethod header cannot override this option if set." },
     "ignoreResponseBody": { "kind": "parameter", "displayName": "Ignore Response Body", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If this option is true, The http producer won't read response body and cache the input stream" },
     "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  [...]
     "preserveHostHeader": { "kind": "parameter", "displayName": "Preserve Host Header", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the option is true, HttpProducer will set the Host header to the value contained in the current exchange Host header, useful in reverse proxy applications where you want the Host header received by the downstream server t [...]
     "throwExceptionOnFailure": { "kind": "parameter", "displayName": "Throw Exception On Failure", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Option to disable throwing the HttpOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code." },
     "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "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. On the producer side the exception will be deserialized  [...]
-    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
+    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
     "cookieStore": { "kind": "parameter", "displayName": "Cookie Store", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.http.client.CookieStore", "deprecated": false, "secret": false, "description": "To use a custom CookieStore. By default the BasicCookieStore is used which is an in-memory only cookie store. Notice if bridgeEndpoint=true then the cookie store is forced to be a noop cookie store as cookie shouldn' [...]
     "deleteWithBody": { "kind": "parameter", "displayName": "Delete With Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the HTTP DELETE should include the message body or not. By default HTTP DELETE do not include any HTTP body. However in some rare cases users may need to be able to include the message body." },
     "getWithBody": { "kind": "parameter", "displayName": "Get With Body", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the HTTP GET should include the message body or not. By default HTTP GET do not include any HTTP body. However in some rare cases users may need to be able to include the message body." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-compute.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-compute.json
index 554f3b3..c3c5d0f 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-compute.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-compute.json
@@ -23,8 +23,7 @@
     "configurationResource": { "kind": "property", "displayName": "Configuration Resource", "group": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "description": "Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream." },
     "igniteConfiguration": { "kind": "property", "displayName": "Ignite Configuration", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.ignite.configuration.IgniteConfiguration", "deprecated": false, "secret": false, "description": "Allows the user to set a programmatic IgniteConfiguration." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "endpointId": { "kind": "path", "displayName": "Endpoint Id", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The endpoint ID (not used)." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-events.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-events.json
index 3bad6e2..557236c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-events.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-events.json
@@ -23,7 +23,6 @@
     "configurationResource": { "kind": "property", "displayName": "Configuration Resource", "group": "consumer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "description": "Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream." },
     "igniteConfiguration": { "kind": "property", "displayName": "Ignite Configuration", "group": "consumer", "required": false, "type": "object", "javaType": "org.apache.ignite.configuration.IgniteConfiguration", "deprecated": false, "secret": false, "description": "Allows the user to set a programmatic IgniteConfiguration." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-idgen.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-idgen.json
index e93103d..7e7294e 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-idgen.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-idgen.json
@@ -23,8 +23,7 @@
     "configurationResource": { "kind": "property", "displayName": "Configuration Resource", "group": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "description": "Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream." },
     "igniteConfiguration": { "kind": "property", "displayName": "Ignite Configuration", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.ignite.configuration.IgniteConfiguration", "deprecated": false, "secret": false, "description": "Allows the user to set a programmatic IgniteConfiguration." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The sequence name." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-queue.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-queue.json
index 450a7ed..24e7486 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-queue.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-queue.json
@@ -23,8 +23,7 @@
     "configurationResource": { "kind": "property", "displayName": "Configuration Resource", "group": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "description": "Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream." },
     "igniteConfiguration": { "kind": "property", "displayName": "Ignite Configuration", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.ignite.configuration.IgniteConfiguration", "deprecated": false, "secret": false, "description": "Allows the user to set a programmatic IgniteConfiguration." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The queue name." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-set.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-set.json
index b842d9a..a39770b 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-set.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ignite-set.json
@@ -23,8 +23,7 @@
     "configurationResource": { "kind": "property", "displayName": "Configuration Resource", "group": "producer", "required": false, "type": "object", "javaType": "java.lang.Object", "deprecated": false, "secret": false, "description": "Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream." },
     "igniteConfiguration": { "kind": "property", "displayName": "Ignite Configuration", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.ignite.configuration.IgniteConfiguration", "deprecated": false, "secret": false, "description": "Allows the user to set a programmatic IgniteConfiguration." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The set name." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/influxdb.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/influxdb.json
index b8abc0e..4deb99c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/influxdb.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/influxdb.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "connectionBean": { "kind": "path", "displayName": "Connection Bean", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Connection to the influx database, of class InfluxDB.class" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iota.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iota.json
index c705aa5..9be4d97 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iota.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/iota.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Component name" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ipfs.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ipfs.json
index d46a3e8..f3aa4bd 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ipfs.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ipfs.json
@@ -2,7 +2,7 @@
  "component": {
     "kind": "component",
     "scheme": "ipfs",
-    "syntax": "ipfs:ipfsHost:ipfsPort/ipfsCmd",
+    "syntax": "ipfs:ipfsCmd",
     "title": "IPFS",
     "description": "The camel-ipfs component provides access to the Interplanetary File System (IPFS).",
     "label": "file,ipfs",
@@ -19,16 +19,15 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
+    "ipfsHost": { "kind": "property", "displayName": "Ipfs Host", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "127.0.0.1", "description": "The ipfs host" },
+    "ipfsPort": { "kind": "property", "displayName": "Ipfs Port", "group": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 5001, "description": "The ipfs port" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
-    "ipfsHost": { "kind": "path", "displayName": "Ipfs Host", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ipfs host" },
-    "ipfsPort": { "kind": "path", "displayName": "Ipfs Port", "group": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "The ipfs port" },
-    "ipfsCmd": { "kind": "path", "displayName": "Ipfs Cmd", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "add", "cat", "get", "version" ], "deprecated": false, "secret": false, "description": "The ipfs command" },
+    "ipfsCmd": { "kind": "path", "displayName": "Ipfs Cmd", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "add", "cat", "get", "version" ], "deprecated": false, "secret": false, "description": "The ipfs command" },
     "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  [...]
-    "outdir": { "kind": "parameter", "displayName": "Outdir", "group": "producer", "required": false, "type": "object", "javaType": "java.nio.file.Path", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.ipfs.IPFSConfiguration", "configurationField": "config", "description": "The ipfs output directory" },
+    "outdir": { "kind": "parameter", "displayName": "Outdir", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.ipfs.IPFSConfiguration", "configurationField": "configuration", "description": "The ipfs output directory" },
     "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)." }
   }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/irc.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/irc.json
index 25b209c..1372d66 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/irc.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/irc.json
@@ -29,11 +29,13 @@
     "hostname": { "kind": "path", "displayName": "Hostname", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Hostname for the IRC chat server" },
     "port": { "kind": "path", "displayName": "Port", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Port number for the IRC chat server. If no port is configured then a default port of either 6667, 6668 or 6669 is used." },
     "autoRejoin": { "kind": "parameter", "displayName": "Auto Rejoin", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "Whether to auto re-join when being kicked" },
+    "channels": { "kind": "parameter", "displayName": "Channels", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "Comma separated list of IRC channels." },
     "commandTimeout": { "kind": "parameter", "displayName": "Command Timeout", "group": "common", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 5000, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "Delay in milliseconds before sending commands after the connection is established." },
-    "namesOnJoin": { "kind": "parameter", "displayName": "Names On Join", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "Sends NAMES command to channel after joining it. onReply has to be true in order to process the result which will have the header value irc.num = '353'." },
-    "nickname": { "kind": "parameter", "displayName": "Nickname", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "The nickname used in chat." },
+    "keys": { "kind": "parameter", "displayName": "Keys", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "Comma separated list of keys for channels." },
+    "namesOnJoin": { "kind": "parameter", "displayName": "Names On Join", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "Sends NAMES command to channel after joining it. onReply has to be true in order to process the result which will have the header  [...]
+    "nickname": { "kind": "parameter", "displayName": "Nickname", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "The nickname used in chat." },
     "persistent": { "kind": "parameter", "displayName": "Persistent", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "Use persistent messages." },
-    "realname": { "kind": "parameter", "displayName": "Realname", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "The IRC user's actual name." },
+    "realname": { "kind": "parameter", "displayName": "Realname", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.irc.IrcConfiguration", "configurationField": "configuration", "description": "The IRC user's actual name." },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "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." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jcache.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jcache.json
index 8d4093b..e1f5fb4 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jcache.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jcache.json
@@ -21,7 +21,8 @@
   "componentProperties": {
     "cachingProvider": { "kind": "property", "displayName": "Caching Provider", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The fully qualified class name of the javax.cache.spi.CachingProvider" },
     "cacheConfiguration": { "kind": "property", "displayName": "Cache Configuration", "group": "common", "required": false, "type": "object", "javaType": "javax.cache.configuration.Configuration", "deprecated": false, "secret": false, "description": "A Configuration for the Cache" },
-    "cacheConfigurationProperties": { "kind": "property", "displayName": "Cache Configuration Properties", "group": "common", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "description": "The Properties for the javax.cache.spi.CachingProvider to create the CacheManager" },
+    "cacheConfigurationProperties": { "kind": "property", "displayName": "Cache Configuration Properties", "group": "common", "required": false, "type": "object", "javaType": "java.util.Map", "deprecated": false, "secret": false, "description": "Properties to configure jcache" },
+    "cacheConfigurationPropertiesRef": { "kind": "property", "displayName": "Cache Configuration Properties Ref", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "References to an existing Properties or Map to lookup in the registry to use for configuring jcache." },
     "configurationUri": { "kind": "property", "displayName": "Configuration Uri", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "An implementation specific URI for the CacheManager" },
     "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" },
     "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 [...]
@@ -39,7 +40,7 @@
     "storeByValue": { "kind": "parameter", "displayName": "Store By Value", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.jcache.JCacheConfiguration", "configurationField": "configuration", "description": "If cache should use store-by-value or store-by-reference semantics" },
     "writeThrough": { "kind": "parameter", "displayName": "Write Through", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jcache.JCacheConfiguration", "configurationField": "configuration", "description": "If write-through caching should be used" },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
-    "filteredEvents": { "kind": "parameter", "displayName": "Filtered Events", "group": "consumer", "label": "consumer", "required": false, "type": "array", "javaType": "java.util.List<javax.cache.event.EventType>", "enum": [ "CREATED", "UPDATED", "REMOVED", "EXPIRED" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jcache.JCacheConfiguration", "configurationField": "configuration", "description": "Events a consumer should filter. If using filter [...]
+    "filteredEvents": { "kind": "parameter", "displayName": "Filtered Events", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "CREATED", "UPDATED", "REMOVED", "EXPIRED" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jcache.JCacheConfiguration", "configurationField": "configuration", "description": "Events a consumer should filter (multiple events can be separated by comma [...]
     "oldValueRequired": { "kind": "parameter", "displayName": "Old Value Required", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jcache.JCacheConfiguration", "configurationField": "configuration", "description": "if the old value is required for events" },
     "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jcache.JCacheConfiguration", "configurationField": "configuration", "description": "if the event listener should block the thread causing the event" },
     "eventFilters": { "kind": "parameter", "displayName": "Event Filters", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "array", "javaType": "java.util.List<javax.cache.event.CacheEntryEventFilter>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jcache.JCacheConfiguration", "configurationField": "configuration", "description": "The CacheEntryEventFilter. If using eventFilters option, then filteredEvents [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jdbc.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jdbc.json
index 16e2788..1c54e21 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jdbc.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jdbc.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "dataSource": { "kind": "property", "displayName": "Data Source", "group": "producer", "required": false, "type": "object", "javaType": "javax.sql.DataSource", "deprecated": false, "secret": false, "description": "To use the DataSource instance instead of looking up the data source by name from the registry." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "dataSourceName": { "kind": "path", "displayName": "Data Source Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of DataSource to lookup in the Registry. If the name is dataSource or default, then Camel will attempt to lookup a default DataSource from the registry, meaning if there is a only one instance of DataSource found, then this DataSource will be used." },
@@ -39,7 +38,7 @@
     "useJDBC4ColumnNameAndLabelSemantics": { "kind": "parameter", "displayName": "Use JDBC4 Column Name And Label Semantics", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Sets whether to use JDBC 4 or JDBC 3.0 or older semantic when retrieving column name. JDBC 4.0 uses columnLabel to get the column name where as JDBC 3.0 uses both columnName or columnLabel. Unfortunately JDBC [...]
     "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" },
     "beanRowMapper": { "kind": "parameter", "displayName": "Bean Row Mapper", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jdbc.BeanRowMapper", "deprecated": false, "secret": false, "description": "To use a custom org.apache.camel.component.jdbc.BeanRowMapper when using outputClass. The default implementation will lower case the row names and skip underscores, and dashes. For example CUST_ID is mapped as custId." },
-    "prepareStatementStrategy": { "kind": "parameter", "displayName": "Prepare Statement Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jdbc.JdbcPrepareStatementStrategy", "deprecated": false, "secret": false, "description": "Allows to plugin to use a custom org.apache.camel.component.jdbc.JdbcPrepareStatementStrategy to control preparation of the query and prepared statement." },
+    "prepareStatementStrategy": { "kind": "parameter", "displayName": "Prepare Statement Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jdbc.JdbcPrepareStatementStrategy", "deprecated": false, "secret": false, "description": "Allows the plugin to use a custom org.apache.camel.component.jdbc.JdbcPrepareStatementStrategy to control preparation of the query and prepared statement." },
     "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)." }
   }
 }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
index 5f9de65..28c25d2 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jetty.json
@@ -51,7 +51,6 @@
     "allowJavaSerializedObject": { "kind": "property", "displayName": "Allow Java Serialized Object", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming [...]
     "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." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jing.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jing.json
index 71eea06..9bdc0e0 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jing.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jing.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "URL to a local resource on the classpath or a full URL to a remote resource or resource on the file system which contains the schema to validate against." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jira.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jira.json
index a35a321..7f4bff6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jira.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jira.json
@@ -19,7 +19,7 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
-    "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jira.JiraConfiguration", "deprecated": false, "secret": false, "description": "The JiraConfiguration parameters" },
+    "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jira.JiraConfiguration", "deprecated": false, "secret": false, "description": "To use a shared base jira configuration." },
     "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" },
     "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 [...]
     "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 [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
index dfe12c8..a8041cd 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
@@ -19,6 +19,8 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
+    "allowAutoWiredConnectionFactory": { "kind": "property", "displayName": "Allow Auto Wired Connection Factory", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to auto-discover ConnectionFactory from the registry, if no connection factory has been configured. If only one instance of ConnectionFactory is found then it will be used. This is enabled  [...]
+    "allowAutoWiredDestinationResolver": { "kind": "property", "displayName": "Allow Auto Wired Destination Resolver", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to auto-discover DestinationResolver from the registry, if no destination resolver has been configured. If only one instance of DestinationResolver is found then it will be used. This i [...]
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.jms.JmsConfiguration", "deprecated": false, "secret": false, "description": "To use a shared JMS configuration" },
     "acceptMessagesWhileStopping": { "kind": "property", "displayName": "Accept Messages While Stopping", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Specifies whether the consumer accept messages while it is stopping. You may consider enabling this option, if you start and stop JMS routes at runtime, while there are still messages en [...]
     "allowReplyManagerQuickStop": { "kind": "property", "displayName": "Allow Reply Manager Quick Stop", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the DefaultMessageListenerContainer used in the reply managers for request-reply messaging allow the DefaultMessageListenerContainer.runningAllowed flag to quick stop in case JmsC [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jmx.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jmx.json
index 80a3631..4877c11 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jmx.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jmx.json
@@ -20,7 +20,6 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jolt.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jolt.json
index 8675351..bcc15d9 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jolt.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jolt.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "transform": { "kind": "property", "displayName": "Transform", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.bazaarvoice.jolt.Transform", "deprecated": false, "secret": false, "description": "Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/json-validator.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/json-validator.json
index 9283f4d..356388c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/json-validator.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/json-validator.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jt400.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jt400.json
index 4859a62..3bb04e6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jt400.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jt400.json
@@ -25,26 +25,27 @@
     "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 [...]
   },
   "properties": {
-    "userID": { "kind": "path", "displayName": "User ID", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Returns the ID of the AS/400 user." },
-    "password": { "kind": "path", "displayName": "Password", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Returns the password of the AS/400 user." },
-    "systemName": { "kind": "path", "displayName": "System Name", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Returns the name of the AS/400 system." },
+    "userID": { "kind": "path", "displayName": "User ID", "group": "security", "label": "security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Returns the ID of the AS/400 user." },
+    "password": { "kind": "path", "displayName": "Password", "group": "security", "label": "security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Returns the password of the AS/400 user." },
+    "systemName": { "kind": "path", "displayName": "System Name", "group": "security", "label": "security", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Returns the name of the AS/400 system." },
     "objectPath": { "kind": "path", "displayName": "Object Path", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Returns the fully qualified integrated file system path name of the target object of this endpoint." },
     "type": { "kind": "path", "displayName": "Type", "group": "common", "required": true, "type": "object", "javaType": "org.apache.camel.component.jt400.Jt400Type", "enum": [ "DTAQ", "PGM", "SRVPGM" ], "deprecated": false, "secret": false, "description": "Whether to work with data queues or remote program call" },
     "ccsid": { "kind": "parameter", "displayName": "Ccsid", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Sets the CCSID to use for the connection with the AS/400 system." },
     "format": { "kind": "parameter", "displayName": "Format", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.jt400.Jt400Configuration.Format", "deprecated": false, "secret": false, "defaultValue": "text", "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Sets the data format for sending messages." },
     "guiAvailable": { "kind": "parameter", "displayName": "Gui Available", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Sets whether AS/400 prompting is enabled in the environment running Camel." },
     "keyed": { "kind": "parameter", "displayName": "Keyed", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Whether to use keyed or non-keyed data queues." },
-    "outputFieldsIdxArray": { "kind": "parameter", "displayName": "Output Fields Idx Array", "group": "common", "required": false, "type": "object", "javaType": "java.lang.Integer[]", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Specifies which fields (program parameters) are output parameters." },
-    "outputFieldsLengthArray": { "kind": "parameter", "displayName": "Output Fields Length Array", "group": "common", "required": false, "type": "object", "javaType": "java.lang.Integer[]", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Specifies the fields (program parameters) length as in the AS/400 program definition." },
     "searchKey": { "kind": "parameter", "displayName": "Search Key", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Search key for keyed data queues." },
-    "searchType": { "kind": "parameter", "displayName": "Search Type", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.jt400.Jt400Configuration.SearchType", "deprecated": false, "secret": false, "defaultValue": "EQ", "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Search type such as EQ for equal etc." },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "readTimeout": { "kind": "parameter", "displayName": "Read Timeout", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 30000, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Timeout in millis the consumer will wait while trying to read a new message of the data queue." },
+    "searchType": { "kind": "parameter", "displayName": "Search Type", "group": "consumer", "label": "consumer", "required": false, "type": "object", "javaType": "org.apache.camel.component.jt400.Jt400Configuration.SearchType", "deprecated": false, "secret": false, "defaultValue": "EQ", "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Search type such as EQ for equal etc." },
     "sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send Empty Message When Idle", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead." },
     "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." },
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange h [...]
     "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  [...]
+    "outputFieldsIdxArray": { "kind": "parameter", "displayName": "Output Fields Idx Array", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Integer[]", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Specifies which fields (program parameters) are output parameters." },
+    "outputFieldsLengthArray": { "kind": "parameter", "displayName": "Output Fields Length Array", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.lang.Integer[]", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Specifies the fields (program parameters) length as in the AS/400 program definition." },
+    "procedureName": { "kind": "parameter", "displayName": "Procedure Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Procedure name from a service program to call" },
     "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." },
@@ -61,7 +62,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." },
-    "procedureName": { "kind": "parameter", "displayName": "Procedure Name", "group": "procedureName", "label": "procedureName", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Procedure name from a service program to call" },
     "secured": { "kind": "parameter", "displayName": "Secured", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.jt400.Jt400Configuration", "configurationField": "configuration", "description": "Whether connections to AS/400 are secured with SSL." }
   }
 }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
index 22365ea..cd13485 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
@@ -32,6 +32,7 @@
   },
   "properties": {
     "topic": { "kind": "path", "displayName": "Topic", "group": "common", "label": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of the topic to use. On the consumer you can use comma to separate multiple topics. A producer can only send a message to a single topic." },
+    "additionalProperties": { "kind": "parameter", "displayName": "Additional Properties", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "additionalProperties.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "Sets additional properties for either [...]
     "brokers": { "kind": "parameter", "displayName": "Brokers", "group": "common", "label": "common", "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 Kafka brokers to use. The format is host1:port1,host2:port2, and the list can be a subset of brokers or a VIP pointing to a subset of broker [...]
     "clientId": { "kind": "parameter", "displayName": "Client Id", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "The client id is a user-specified string sent in each request to help trace calls. It should logically identify the application making the request." },
     "headerFilterStrategy": { "kind": "parameter", "displayName": "Header Filter Strategy", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration", "configurationField": "configuration", "description": "To use a custom HeaderFilterStrategy to filter header to and from Camel message." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
index 2c33840..270cee0 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-config-maps.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "masterUrl": { "kind": "path", "displayName": "Master Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Kubernetes Master url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes-claims.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes-claims.json
index c5277d1..c6295b8 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes-claims.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes-claims.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "masterUrl": { "kind": "path", "displayName": "Master Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Kubernetes Master url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes.json
index 5b747d2..a65f5b7 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-persistent-volumes.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "masterUrl": { "kind": "path", "displayName": "Master Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Kubernetes Master url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-resources-quota.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-resources-quota.json
index 90f9f17..afa1d86 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-resources-quota.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-resources-quota.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "masterUrl": { "kind": "path", "displayName": "Master Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Kubernetes Master url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-secrets.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-secrets.json
index 3b806d4..fc7c873 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-secrets.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-secrets.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "masterUrl": { "kind": "path", "displayName": "Master Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Kubernetes Master url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-service-accounts.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-service-accounts.json
index a65ef32..9131ea0 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-service-accounts.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-service-accounts.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "masterUrl": { "kind": "path", "displayName": "Master Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Kubernetes Master url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-services.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-services.json
index f9d1835..dac4dde 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-services.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kubernetes-services.json
@@ -4,7 +4,7 @@
     "scheme": "kubernetes-services",
     "syntax": "kubernetes-services:masterUrl",
     "title": "Kubernetes Services",
-    "description": "The Kubernetes Service Accounts component provides a producer to execute service operations and a consumer to consume service events.",
+    "description": "The Kubernetes Services component provides a producer to execute service operations and a consumer to consume service events.",
     "label": "container,cloud,paas",
     "deprecated": false,
     "deprecationNote": "",
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
index 229c7dc..9c6c8eb 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kudu.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Kudu master to connect to" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/language.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/language.json
index 2722eba6..dd1f111 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/language.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/language.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "languageName": { "kind": "path", "displayName": "Language Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "bean", "constant", "exchangeProperty", "file", "groovy", "header", "javascript", "jsonpath", "mvel", "ognl", "", "ref", "simple", "spel", "sql", "terser", "tokenize", "xpath", "xquery", "xtokenize" ], "deprecated": false, "secret": false, "description": "Sets the name of the language to use" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldap.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldap.json
index 66d604e..4c26055 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldap.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldap.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "dirContextName": { "kind": "path", "displayName": "Dir Context Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of either a javax.naming.directory.DirContext, or java.util.Hashtable, or Map bean to lookup in the registry. If the bean is either a Hashtable or Map then a new javax.naming.directory.DirContext instance is created for each use. If the bean is a javax.naming.directory [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldif.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldif.json
index f0873f5..f347643 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldif.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ldif.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "ldapConnectionName": { "kind": "path", "displayName": "Ldap Connection Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the LdapConnection bean to pull from the registry. Note that this must be of scope prototype to avoid it being shared among threads or using a connection that has timed out." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/log.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/log.json
index 2bfeac2..a3f7ee8 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/log.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/log.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "exchangeFormatter": { "kind": "property", "displayName": "Exchange Formatter", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExchangeFormatter", "deprecated": false, "secret": false, "description": "Sets a custom ExchangeFormatter to convert the Exchange to a String suitable for logging. If not specified, we default to DefaultExchangeFormatter." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "loggerName": { "kind": "path", "displayName": "Logger Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The logger name to use" },
@@ -42,7 +41,7 @@
     "showAll": { "kind": "parameter", "displayName": "Show All", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Quick option for turning all options on. (multiline, maxChars has to be manually set if to be used)" },
     "showBody": { "kind": "parameter", "displayName": "Show Body", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Show the message body." },
     "showBodyType": { "kind": "parameter", "displayName": "Show Body Type", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Show the body Java type." },
-    "showCaughtException": { "kind": "parameter", "displayName": "Show Caught Exception", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "f the exchange has a caught exception, show the exception message (no stack trace).A caught exception is stored as a property on the exchange (using the key org.apache.camel.Exchange#EXCEPTION_CAUGHT and for instance a [...]
+    "showCaughtException": { "kind": "parameter", "displayName": "Show Caught Exception", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the exchange has a caught exception, show the exception message (no stack trace). A caught exception is stored as a property on the exchange (using the key org.apache.camel.Exchange#EXCEPTION_CAUGHT) and for instanc [...]
     "showException": { "kind": "parameter", "displayName": "Show Exception", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If the exchange has an exception, show the exception message (no stacktrace)" },
     "showExchangeId": { "kind": "parameter", "displayName": "Show Exchange Id", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Show the unique exchange ID." },
     "showExchangePattern": { "kind": "parameter", "displayName": "Show Exchange Pattern", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Shows the Message Exchange Pattern (or MEP for short)." },
@@ -52,7 +51,7 @@
     "showProperties": { "kind": "parameter", "displayName": "Show Properties", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Show the exchange properties." },
     "showStackTrace": { "kind": "parameter", "displayName": "Show Stack Trace", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Show the stack trace, if an exchange has an exception. Only effective if one of showAll, showException or showCaughtException are enabled." },
     "showStreams": { "kind": "parameter", "displayName": "Show Streams", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether Camel should show stream bodies or not (eg such as java.io.InputStream). Beware if you enable this option then you may not be able later to access the message body as the stream have already been read by this logger. To remedy  [...]
-    "skipBodyLineSeparator": { "kind": "parameter", "displayName": "Skip Body Line Separator", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to skip line separators when logging the message body.This allows to log the message body in one line, setting this option to false will preserve any line separators from the body, which then will log the b [...]
+    "skipBodyLineSeparator": { "kind": "parameter", "displayName": "Skip Body Line Separator", "group": "formatting", "label": "formatting", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to skip line separators when logging the message body. This allows to log the message body in one line, setting this option to false will preserve any line separators from the body, which then will log the  [...]
     "style": { "kind": "parameter", "displayName": "Style", "group": "formatting", "label": "formatting", "required": false, "type": "object", "javaType": "org.apache.camel.support.processor.DefaultExchangeFormatter.OutputStyle", "enum": [ "Default", "Tab", "Fixed" ], "deprecated": false, "secret": false, "defaultValue": "Default", "description": "Sets the outputs style to use." }
   }
 }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lpr.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lpr.json
index 2637567..4afe68f 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lpr.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lpr.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "hostname": { "kind": "path", "displayName": "Hostname", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Hostname of the printer" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lucene.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lucene.json
index 4d02cfb..2f285c6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lucene.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lucene.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "config": { "kind": "property", "displayName": "Config", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.lucene.LuceneConfiguration", "deprecated": false, "secret": false, "description": "To use a shared lucene configuration" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The URL to the lucene server" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lumberjack.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lumberjack.json
index 1cb7974..22f203a 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lumberjack.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/lumberjack.json
@@ -22,7 +22,6 @@
     "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, "description": "Sets the default SSL configuration to use for all the endpoints. You can also configure it directly at the endpoint level." },
     "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." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/master.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/master.json
index 2669e1d..2ce158f 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/master.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/master.json
@@ -22,7 +22,6 @@
     "service": { "kind": "property", "displayName": "Service", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.cluster.CamelClusterService", "deprecated": false, "secret": false, "description": "Inject the service to use." },
     "serviceSelector": { "kind": "property", "displayName": "Service Selector", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.cluster.CamelClusterService.Selector", "deprecated": false, "secret": false, "description": "Inject the service selector used to lookup the CamelClusterService to use." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/metrics.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/metrics.json
index 3ac9da1..60af579 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/metrics.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/metrics.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "metricRegistry": { "kind": "property", "displayName": "Metric Registry", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.codahale.metrics.MetricRegistry", "deprecated": false, "secret": false, "description": "To use a custom configured MetricRegistry." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "metricsType": { "kind": "path", "displayName": "Metrics Type", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.metrics.MetricsType", "enum": [ "GAUGE", "COUNTER", "HISTOGRAM", "METER", "TIMER" ], "deprecated": false, "secret": false, "description": "Type of metrics" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/micrometer.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/micrometer.json
index c819994..cae3760 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/micrometer.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/micrometer.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "metricsRegistry": { "kind": "property", "displayName": "Metrics Registry", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.micrometer.core.instrument.MeterRegistry", "deprecated": false, "secret": false, "description": "To use a custom configured MetricRegistry." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "metricsType": { "kind": "path", "displayName": "Metrics Type", "group": "producer", "required": true, "type": "object", "javaType": "io.micrometer.core.instrument.Meter.Type", "deprecated": false, "secret": false, "description": "Type of metrics" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mock.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mock.json
index e145e3b..eb6c27c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mock.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mock.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of mock endpoint" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
index f6da64b..f2c951e 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb.json
@@ -19,7 +19,7 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
-    "mongoConnection": { "kind": "property", "displayName": "Mongo Connection", "group": "common", "required": false, "type": "object", "javaType": "com.mongodb.MongoClient", "deprecated": false, "secret": false, "description": "Set a client used for connection: all endpoints generated from the component will share this connection bean." },
+    "mongoConnection": { "kind": "property", "displayName": "Mongo Connection", "group": "common", "required": false, "type": "object", "javaType": "com.mongodb.client.MongoClient", "deprecated": false, "secret": false, "description": "Set a client used for connection: all endpoints generated from the component will share this connection bean." },
     "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" },
     "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 [...]
     "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 [...]
@@ -30,7 +30,7 @@
     "collectionIndex": { "kind": "parameter", "displayName": "Collection Index", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the collection index (JSON FORMAT : { field1 : order1, field2 : order2})" },
     "createCollection": { "kind": "parameter", "displayName": "Create Collection", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Create collection during initialisation if it doesn't exist. Default is true." },
     "database": { "kind": "parameter", "displayName": "Database", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the name of the MongoDB database to target" },
-    "mongoConnection": { "kind": "parameter", "displayName": "Mongo Connection", "group": "common", "required": false, "type": "object", "javaType": "com.mongodb.MongoClient", "deprecated": false, "secret": false, "description": "Sets the Mongo instance that represents the backing connection" },
+    "mongoConnection": { "kind": "parameter", "displayName": "Mongo Connection", "group": "common", "required": false, "type": "object", "javaType": "com.mongodb.client.MongoClient", "deprecated": false, "secret": false, "description": "Sets the Mongo instance that represents the backing connection" },
     "operation": { "kind": "parameter", "displayName": "Operation", "group": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.mongodb.MongoDbOperation", "enum": [ "findById", "findOneByQuery", "findAll", "findDistinct", "insert", "save", "update", "remove", "bulkWrite", "aggregate", "getDbStats", "getColStats", "count", "command" ], "deprecated": false, "secret": false, "description": "Sets the operation this endpoint will execute against MongoDB." },
     "outputType": { "kind": "parameter", "displayName": "Output Type", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.apache.camel.component.mongodb.MongoDbOutputType", "enum": [ "DocumentList", "Document", "MongoIterable" ], "deprecated": false, "secret": false, "description": "Convert the output of the producer to the selected type : DocumentList Document or MongoIterable. DocumentList or MongoIterable applies to findAll and aggregate. Docum [...]
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
@@ -41,7 +41,9 @@
     "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" },
     "cursorRegenerationDelay": { "kind": "parameter", "displayName": "Cursor Regeneration Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 1000, "description": "MongoDB tailable cursors will block until new data arrives. If no new data is inserted, after some time the cursor will be automatically freed and closed by the MongoDB server. The client is expected to regenerate the  [...]
     "dynamicity": { "kind": "parameter", "displayName": "Dynamicity", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether this endpoint will attempt to dynamically resolve the target database and collection from the incoming Exchange properties. Can be used to override at runtime the database and collection specified on the otherwise static endpoint [...]
+    "readPreference": { "kind": "parameter", "displayName": "Read Preference", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "PRIMARY", "PRIMARY_PREFERRED", "SECONDARY", "SECONDARY_PREFERRED", "NEAREST" ], "deprecated": false, "secret": false, "defaultValue": "PRIMARY", "description": "Configure how MongoDB clients route read operations to the members of a replica set. Possible values are PRIMARY, PRIMARY_PREFERRE [...]
     "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)." },
+    "writeConcern": { "kind": "parameter", "displayName": "Write Concern", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "ACKNOWLEDGED", "W1", "W2", "W3", "UNACKNOWLEDGED", "JOURNALED", "MAJORITY" ], "deprecated": false, "secret": false, "defaultValue": "ACKNOWLEDGED", "description": "Configure the connection bean with the level of acknowledgment requested from MongoDB for write operations to a standalone mongod,  [...]
     "writeResultAsHeader": { "kind": "parameter", "displayName": "Write Result As Header", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "In write operations, it determines whether instead of returning WriteResult as the body of the OUT message, we transfer the IN message to the OUT and attach the WriteResult as a header." },
     "streamFilter": { "kind": "parameter", "displayName": "Stream Filter", "group": "changeStream", "label": "changeStream", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Filter condition for change streams consumer." },
     "persistentId": { "kind": "parameter", "displayName": "Persistent Id", "group": "tail", "label": "tail", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "One tail tracking collection can host many trackers for several tailable consumers. To keep them separate, each tracker should have its own unique persistentId." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/msv.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/msv.json
index 626df50..761ff31 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/msv.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/msv.json
@@ -22,8 +22,7 @@
     "schemaFactory": { "kind": "property", "displayName": "Schema Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "javax.xml.validation.SchemaFactory", "deprecated": false, "secret": false, "description": "To use the javax.xml.validation.SchemaFactory." },
     "resourceResolverFactory": {"kind":"property","displayName":"Resource Resolver Factory","group":"advanced","label":"advanced","required":false,"type":"object","javaType":"org.apache.camel.component.validator.ValidatorResourceResolverFactory","deprecated":false,"secret":false,"description":"To use a custom LSResourceResolver which depends on a dynamic endpoint resource URI"},
     "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"},
-    "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 route to fail being sta [...]
-    "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 the routing Error Han [...]
+    "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 route to fail being sta [...]
   },
   "properties": {
     "resourceUri": {"kind":"path","displayName":"Resource Uri","group":"producer","required":true,"type":"string","javaType":"java.lang.String","deprecated":false,"secret":false,"description":"URL to a local resource on the classpath,or a reference to lookup a bean in the Registry, or a full URL to a remote resource or resource on the file system which contains the XSD to validate against."},
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mustache.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mustache.json
index bc4bd60..fddab6c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mustache.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mustache.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "mustacheFactory": { "kind": "property", "displayName": "Mustache Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.github.mustachejava.MustacheFactory", "deprecated": false, "secret": false, "description": "To use a custom MustacheFactory" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mvel.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mvel.json
index fe37bf4..4576409 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mvel.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mvel.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis-bean.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis-bean.json
index 4224f34..f387b1e 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis-bean.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mybatis-bean.json
@@ -22,8 +22,7 @@
     "sqlSessionFactory": { "kind": "property", "displayName": "Sql Session Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.ibatis.session.SqlSessionFactory", "deprecated": false, "secret": false, "description": "To use the SqlSessionFactory" },
     "configurationUri": { "kind": "property", "displayName": "Configuration Uri", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "SqlMapConfig.xml", "description": "Location of MyBatis xml configuration file. The default value is: SqlMapConfig.xml loaded from the classpath" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "beanName": { "kind": "path", "displayName": "Bean Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of the bean with the MyBatis annotations. This can either by a type alias or a FQN class name." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nagios.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nagios.json
index 9342d58..cbfead0 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nagios.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nagios.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.nagios.NagiosConfiguration", "deprecated": false, "secret": false, "description": "To use a shared NagiosConfiguration" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "This is the address of the Nagios host where checks should be send." },
@@ -34,7 +33,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" },
     "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)." },
     "encryption": { "kind": "parameter", "displayName": "Encryption", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "com.googlecode.jsendnsca.encryption.Encryption", "enum": [ "NONE", "TRIPLE_DES", "XOR", "RIJNDAEL128", "RIJNDAEL192", "RIJNDAEL256", "BLOWFISH" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nagios.NagiosConfiguration", "configurationField": "configuration", "description": "To specify  [...]
-    "encryptionMethod": { "kind": "parameter", "displayName": "Encryption Method", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.component.nagios.NagiosEncryptionMethod", "enum": [ "No", "Xor", "TripleDes" ], "deprecated": true, "secret": false, "configurationClass": "org.apache.camel.component.nagios.NagiosConfiguration", "configurationField": "configuration", "description": "To specify an encryption method." },
     "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.nagios.NagiosConfiguration", "configurationField": "configuration", "description": "Password to be authenticated when sending checks to Nagios." }
   }
 }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
index 222315f..d93cbfe 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nats.json
@@ -2,7 +2,7 @@
  "component": {
     "kind": "component",
     "scheme": "nats",
-    "syntax": "nats:servers",
+    "syntax": "nats:topic",
     "title": "Nats",
     "description": "The nats component allows you produce and consume messages from NATS.",
     "label": "messaging",
@@ -19,37 +19,39 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
+    "servers": { "kind": "property", "displayName": "Servers", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "URLs to one or more NAT servers. Use comma to separate URLs when specifying multiple servers." },
     "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." },
     "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" },
     "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 [...]
     "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 [...]
   },
   "properties": {
-    "servers": { "kind": "path", "displayName": "Servers", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "URLs to one or more NAT servers. Use comma to separate URLs when specifying multiple servers." },
-    "connection": { "kind": "parameter", "displayName": "Connection", "group": "common", "required": false, "type": "object", "javaType": "io.nats.client.Connection", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Reference an already instantiated connection to Nats server" },
+    "topic": { "kind": "path", "displayName": "Topic", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of topic we want to use" },
     "connectionTimeout": { "kind": "parameter", "displayName": "Connection Timeout", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 2000, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Timeout for connection attempts. (in milliseconds)" },
-    "flushConnection": { "kind": "parameter", "displayName": "Flush Connection", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Define if we want to flush connection or not" },
+    "flushConnection": { "kind": "parameter", "displayName": "Flush Connection", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Define if we want to flush connection when stopping or not" },
     "flushTimeout": { "kind": "parameter", "displayName": "Flush Timeout", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1000, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Set the flush timeout (in milliseconds)" },
     "maxPingsOut": { "kind": "parameter", "displayName": "Max Pings Out", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 2, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "maximum number of pings have not received a response allowed by the client" },
     "maxReconnectAttempts": { "kind": "parameter", "displayName": "Max Reconnect Attempts", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 60, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Max reconnection attempts" },
     "noEcho": { "kind": "parameter", "displayName": "No Echo", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Turn off echo. If supported by the gnatsd version you are connecting to this flag will prevent the server from echoing messages back to the connection if it h [...]
     "noRandomizeServers": { "kind": "parameter", "displayName": "No Randomize Servers", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not randomizing the order of servers for the connection attempts" },
-    "pedantic": { "kind": "parameter", "displayName": "Pedantic", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not running in pedantic mode (this affects performace)" },
+    "pedantic": { "kind": "parameter", "displayName": "Pedantic", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not running in pedantic mode (this affects performace)" },
     "pingInterval": { "kind": "parameter", "displayName": "Ping Interval", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 120000, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Ping interval to be aware if connection is still alive (in milliseconds)" },
-    "reconnect": { "kind": "parameter", "displayName": "Reconnect", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not using reconnection feature" },
-    "reconnectTimeWait": { "kind": "parameter", "displayName": "Reconnect Time Wait", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 2000, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Waiting time before attempts reconnection (in milliseconds)" },
+    "reconnect": { "kind": "parameter", "displayName": "Reconnect", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not using reconnection feature" },
+    "reconnectTimeWait": { "kind": "parameter", "displayName": "Reconnect Time Wait", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 2000, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Waiting time before attempts reconnection (in milliseconds)" },
     "requestCleanupInterval": { "kind": "parameter", "displayName": "Request Cleanup Interval", "group": "common", "label": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 5000, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Interval to clean up cancelled/timed out requests." },
-    "topic": { "kind": "parameter", "displayName": "Topic", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "The name of topic we want to use" },
+    "servers": { "kind": "parameter", "displayName": "Servers", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "URLs to one or more NAT servers. Use comma to separate URLs when specifying multiple servers." },
     "verbose": { "kind": "parameter", "displayName": "Verbose", "group": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Whether or not running in verbose mode" },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "maxMessages": { "kind": "parameter", "displayName": "Max Messages", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Stop receiving messages from a topic we are subscribing to after maxMessages" },
-    "poolSize": { "kind": "parameter", "displayName": "Pool Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 10, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Consumer pool size" },
+    "poolSize": { "kind": "parameter", "displayName": "Pool Size", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 10, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Consumer thread pool size (default is 10)" },
     "queueName": { "kind": "parameter", "displayName": "Queue Name", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "The Queue name if we are using nats for a queue configuration" },
+    "replyToDisabled": { "kind": "parameter", "displayName": "Reply To Disabled", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Can be used to turn off sending back reply message in the consumer." },
     "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  [...]
     "replySubject": { "kind": "parameter", "displayName": "Reply Subject", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "the subject to which subscribers should send response" },
     "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" },
+    "connection": { "kind": "parameter", "displayName": "Connection", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.nats.client.Connection", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Reference an already instantiated connection to Nats server" },
     "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)." },
     "secure": { "kind": "parameter", "displayName": "Secure", "group": "security", "label": "security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.nats.NatsConfiguration", "configurationField": "configuration", "description": "Set secure option indicating TLS is required" },
     "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.nats.NatsConfiguration", "configurationField": "configuration", "description": "To configure security using SSLContextParameters" }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
index 9c13075..8f0e9e2 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
@@ -25,8 +25,8 @@
     "headerFilterStrategy": { "kind": "property", "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 org.apache.camel.spi.HeaderFilterStrategy to filter headers." },
     "securityConfiguration": { "kind": "property", "displayName": "Security Configuration", "group": "security", "label": "security", "required": false, "type": "object", "javaType": "org.apache.camel.component.netty.http.NettyHttpSecurityConfiguration", "deprecated": false, "secret": false, "description": "Refers to a org.apache.camel.component.netty.http.NettyHttpSecurityConfiguration for configuring secure web resources." },
     "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." },
-    "maximumPoolSize": {"kind":"property","displayName":"Maximum Pool Size","group":"advanced","label":"advanced","required":false,"type":"integer","javaType":"int","deprecated":false,"secret":false,"defaultValue":16,"description":"The thread pool size for the EventExecutorGroup if its in use. The default value is 16."},
-    "executorService": {"kind":"property","displayName":"Executor Service","group":"advanced","label":"advanced","required":false,"type":"object","javaType":"io.netty.util.concurrent.EventExecutorGroup","deprecated":false,"secret":false,"description":"To use the given EventExecutorGroup."},
+    "maximumPoolSize": {"kind":"property","displayName":"Maximum Pool Size","group":"consumer (advanced)","label":"consumer,advanced","required":false,"type":"integer","javaType":"int","deprecated":false,"secret":false,"description":"Sets a maximum thread pool size for the netty consumer ordered thread pool. The default size is 2 x cpu core 1. Setting this value to eg 10 will then use 10 threads unless 2 x cpu core 1 is a higher value, which then will override and be used. For example if [...]
+    "executorService": {"kind":"property","displayName":"Executor Service","group":"consumer (advanced)","label":"consumer,advanced","required":false,"type":"object","javaType":"io.netty.util.concurrent.EventExecutorGroup","deprecated":false,"secret":false,"description":"To use the given EventExecutorGroup."},
     "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,"description":"To configure security using SSLContextParameters"},
     "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"},
     "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 route to fail being sta [...]
@@ -48,7 +48,7 @@
     "muteException": { "kind": "parameter", "displayName": "Mute Exception", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "If enabled and an Exchange failed processing on the consumer side the response's body won't contain the except [...]
     "send503whenSuspended": { "kind": "parameter", "displayName": "Send503when Suspended", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Whether to send back HTTP status code 503 when the consumer has been suspended. If the option is  [...]
     "backlog": { "kind": "parameter", "displayName": "Backlog", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Allows to configure a backlog for netty consumer (server). Note the backlog is just a best effort depending on the OS. Setting thi [...]
-    "bossCount": { "kind": "parameter", "displayName": "Boss Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use thi [...]
+    "bossCount": { "kind": "parameter", "displayName": "Boss Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use thi [...]
     "bossGroup": { "kind": "parameter", "displayName": "Boss Group", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "io.netty.channel.EventLoopGroup", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Set the BossGroup which could be used for handling the new connection of the server side across th [...]
     "chunkedMaxContentLength": { "kind": "parameter", "displayName": "Chunked Max Content Length", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1048576, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Value in bytes the max content length per chunked frame received on th [...]
     "compression": { "kind": "parameter", "displayName": "Compression", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Allow using gzip/deflate for compression on the Netty HTTP server if the client supports it fro [...]
@@ -67,7 +67,7 @@
     "urlDecodeHeaders": { "kind": "parameter", "displayName": "Url Decode Headers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "If this option is enabled, then during binding from Netty to Camel Message then the [...]
     "usingExecutorService": { "kind": "parameter", "displayName": "Using Executor Service", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Whether to use ordered thread pool, to ensure events are processed orderly o [...]
     "connectTimeout": { "kind": "parameter", "displayName": "Connect Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 10000, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Time to wait for a socket connection to be available. Value is in milliseconds." },
-    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
+    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
     "requestTimeout": { "kind": "parameter", "displayName": "Request Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Allows to use a timeout for the Netty producer when calling a remote server. By default no timeout is in use. The value is in milli se [...]
     "throwExceptionOnFailure": { "kind": "parameter", "displayName": "Throw Exception On Failure", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Option to disable throwing the HttpOperationFailedException in case of failed responses f [...]
     "clientInitializerFactory": { "kind": "parameter", "displayName": "Client Initializer Factory", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.netty.ClientInitializerFactory", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "To use a custom ClientInitializerFactory" },
@@ -92,7 +92,7 @@
     "sendBufferSize": { "kind": "parameter", "displayName": "Send Buffer Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 65536, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "The TCP/UDP buffer sizes to be used during outbound communication. Size is bytes." },
     "transferException": { "kind": "parameter", "displayName": "Transfer Exception", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was sen [...]
     "transferExchange": { "kind": "parameter", "displayName": "Transfer Exchange", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following f [...]
-    "workerCount": { "kind": "parameter", "displayName": "Worker Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "When netty works on nio mode, it uses default workerCount parameter from Netty, which is cpu_core_threads x 2. User can use this operation to [...]
+    "workerCount": { "kind": "parameter", "displayName": "Worker Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "When netty works on nio mode, it uses default workerCount parameter from Netty (which is cpu_core_threads x 2). User can use this option to o [...]
     "workerGroup": { "kind": "parameter", "displayName": "Worker Group", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.netty.channel.EventLoopGroup", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool with multiple consume [...]
     "decoders": { "kind": "parameter", "displayName": "Decoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "A list of decoders to be used. You can use a String which have values separated by comma, and have the values be [...]
     "encoders": { "kind": "parameter", "displayName": "Encoders", "group": "codec", "label": "codec", "required": false, "type": "array", "javaType": "java.util.List<io.netty.channel.ChannelHandler>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.http.NettyHttpConfiguration", "configurationField": "configuration", "description": "A list of encoders to be used. You can use a String which have values separated by comma, and have the values be [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
index e8cfd00..8aa181f 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
@@ -19,9 +19,9 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
-    "maximumPoolSize": { "kind": "property", "displayName": "Maximum Pool Size", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 16, "description": "The thread pool size for the EventExecutorGroup if its in use. The default value is 16." },
+    "maximumPoolSize": { "kind": "property", "displayName": "Maximum Pool Size", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Sets a maximum thread pool size for the netty consumer ordered thread pool. The default size is 2 x cpu core 1. Setting this value to eg 10 will then use 10 threads unless 2 x cpu core 1 is a higher value, which then will override and be  [...]
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.netty.NettyConfiguration", "deprecated": false, "secret": false, "description": "To use the NettyConfiguration as configuration when creating endpoints." },
-    "executorService": { "kind": "property", "displayName": "Executor Service", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.netty.util.concurrent.EventExecutorGroup", "deprecated": false, "secret": false, "description": "To use the given EventExecutorGroup." },
+    "executorService": { "kind": "property", "displayName": "Executor Service", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "io.netty.util.concurrent.EventExecutorGroup", "deprecated": false, "secret": false, "description": "To use the given EventExecutorGroup." },
     "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." },
     "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, "description": "To configure security using SSLContextParameters" },
     "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" },
@@ -44,7 +44,7 @@
     "reconnect": { "kind": "parameter", "displayName": "Reconnect", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Used only in clientMode in consumer, the consumer will attempt to reconnect on disconnection if this is enabled" },
     "reconnectInterval": { "kind": "parameter", "displayName": "Reconnect Interval", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 10000, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Used if reconnect and clientMode is enabled. The interval in milli seconds to attempt reconnection" },
     "backlog": { "kind": "parameter", "displayName": "Backlog", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Allows to configure a backlog for netty consumer (server). Note the backlog is just a best effort depending on the OS. Setting this option  [...]
-    "bossCount": { "kind": "parameter", "displayName": "Boss Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use this operati [...]
+    "bossCount": { "kind": "parameter", "displayName": "Boss Count", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use this option  [...]
     "bossGroup": { "kind": "parameter", "displayName": "Boss Group", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "io.netty.channel.EventLoopGroup", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Set the BossGroup which could be used for handling the new connection of the server side across the NettyEn [...]
     "disconnectOnNoReply": { "kind": "parameter", "displayName": "Disconnect On No Reply", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "If sync is enabled then this option dictates NettyConsumer if it should disconnect whe [...]
     "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 [...]
@@ -80,7 +80,7 @@
     "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)." },
     "transferExchange": { "kind": "parameter", "displayName": "Transfer Exchange", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Only used for TCP. You can transfer the exchange over the wire instead of just the body. The following fields are [...]
     "udpByteArrayCodec": { "kind": "parameter", "displayName": "Udp Byte Array Codec", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "For UDP only. If enabled the using byte array codec instead of Java serialization protocol." },
-    "workerCount": { "kind": "parameter", "displayName": "Worker Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "When netty works on nio mode, it uses default workerCount parameter from Netty, which is cpu_core_threads x 2. User can use this operation to override [...]
+    "workerCount": { "kind": "parameter", "displayName": "Worker Count", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "When netty works on nio mode, it uses default workerCount parameter from Netty (which is cpu_core_threads x 2). User can use this option to override t [...]
     "workerGroup": { "kind": "parameter", "displayName": "Worker Group", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "io.netty.channel.EventLoopGroup", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "To use a explicit EventLoopGroup as the boss thread pool. For example to share a thread pool with multiple consumers or pro [...]
     "allowDefaultCodec": { "kind": "parameter", "displayName": "Allow Default Codec", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "The netty component installs a default codec if both, encoder/decoder is null and textline is false. Setting allowDef [...]
     "autoAppendDelimiter": { "kind": "parameter", "displayName": "Auto Append Delimiter", "group": "codec", "label": "codec", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.netty.NettyConfiguration", "configurationField": "configuration", "description": "Whether or not to auto append missing end delimiter when sending using the textline codec." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nsq.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nsq.json
index 1d61528..ffd1894 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nsq.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/nsq.json
@@ -2,7 +2,7 @@
  "component": {
     "kind": "component",
     "scheme": "nsq",
-    "syntax": "nsq:servers",
+    "syntax": "nsq:topic",
     "title": "NSQ",
     "description": "Represents a nsq endpoint.",
     "label": "messaging",
@@ -19,14 +19,15 @@
     "version": "1.0.0-SNAPSHOT"
   },
   "componentProperties": {
+    "servers": { "kind": "property", "displayName": "Servers", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer)." },
     "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." },
     "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" },
     "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 [...]
     "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 [...]
   },
   "properties": {
-    "servers": { "kind": "path", "displayName": "Servers", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer)." },
-    "topic": { "kind": "parameter", "displayName": "Topic", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nsq.NsqConfiguration", "configurationField": "configuration", "description": "The name of topic we want to use" },
+    "topic": { "kind": "path", "displayName": "Topic", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of topic we want to use" },
+    "servers": { "kind": "parameter", "displayName": "Servers", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nsq.NsqConfiguration", "configurationField": "configuration", "description": "The hostnames of one or more nsqlookupd servers (consumer) or nsqd servers (producer)." },
     "userAgent": { "kind": "parameter", "displayName": "User Agent", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.nsq.NsqConfiguration", "configurationField": "configuration", "description": "A String to identify the kind of client" },
     "autoFinish": { "kind": "parameter", "displayName": "Auto Finish", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.nsq.NsqConfiguration", "configurationField": "configuration", "description": "Automatically finish the NSQ message when it is retrieved from the quese and before the Exchange is processed." },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-build-configs.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-build-configs.json
index 5ba71dd..4cd14d1 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-build-configs.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-build-configs.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "masterUrl": { "kind": "path", "displayName": "Master Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Kubernetes Master url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-builds.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-builds.json
index 0a1da67..a0d792e 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-builds.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openshift-builds.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "masterUrl": { "kind": "path", "displayName": "Master Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Kubernetes Master url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-cinder.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-cinder.json
index 24472c2..30b22aa 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-cinder.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-cinder.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "OpenStack host url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-glance.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-glance.json
index f824df1..f602898 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-glance.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-glance.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "OpenStack host url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-keystone.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-keystone.json
index 3a5e976..2f4542d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-keystone.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-keystone.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "OpenStack host url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
index 57b58ef..0fea9e8 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-neutron.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "OpenStack host url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-nova.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-nova.json
index f4e2d6a..4ce36d8 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-nova.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-nova.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "OpenStack host url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-swift.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-swift.json
index 1107f3b..a6a03ed 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-swift.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/openstack-swift.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "OpenStack host url" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pdf.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pdf.json
index f826b1b..757ed70 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pdf.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pdf.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "operation": { "kind": "path", "displayName": "Operation", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.pdf.PdfOperation", "enum": [ "create", "append", "extractText" ], "deprecated": false, "secret": false, "description": "Operation type" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pg-replication-slot.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pg-replication-slot.json
index 0458d58..76194a9 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pg-replication-slot.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/pg-replication-slot.json
@@ -20,7 +20,6 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
index f918d76..5f46ebf 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/platform-http.json
@@ -20,7 +20,6 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
index f490043..89796fb 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/quartz.json
@@ -23,14 +23,14 @@
     "startDelayedSeconds": { "kind": "property", "displayName": "Start Delayed Seconds", "group": "scheduler", "label": "scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Seconds to wait before starting the quartz scheduler." },
     "prefixJobNameWithEndpointId": { "kind": "property", "displayName": "Prefix Job Name With Endpoint Id", "group": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to prefix the quartz job with the endpoint id. This option is default false." },
     "enableJmx": { "kind": "property", "displayName": "Enable Jmx", "group": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to enable Quartz JMX which allows to manage the Quartz scheduler from JMX. This options is default true" },
-    "properties": { "kind": "property", "displayName": "Properties", "group": "consumer", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "description": "Properties to configure the Quartz scheduler." },
+    "propertiesRef": { "kind": "property", "displayName": "Properties Ref", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "References to an existing Properties or Map to lookup in the registry to use for configuring quartz." },
+    "properties": { "kind": "property", "displayName": "Properties", "group": "consumer", "required": false, "type": "object", "javaType": "java.util.Map", "deprecated": false, "secret": false, "description": "Properties to configure the Quartz scheduler." },
     "propertiesFile": { "kind": "property", "displayName": "Properties File", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "File name of the properties to load from the classpath" },
     "prefixInstanceName": { "kind": "property", "displayName": "Prefix Instance Name", "group": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to prefix the Quartz Scheduler instance name with the CamelContext name. This is enabled by default, to let each CamelContext use its own Quartz scheduler instance by default. You can set this option to false to reuse Quartz scheduler inst [...]
     "interruptJobsOnShutdown": { "kind": "property", "displayName": "Interrupt Jobs On Shutdown", "group": "scheduler", "label": "scheduler", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to interrupt jobs on shutdown which forces the scheduler to shutdown quicker and attempt to interrupt any running jobs. If this is enabled then any running jobs can fail due to being interrupted." },
     "schedulerFactory": { "kind": "property", "displayName": "Scheduler Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.quartz.SchedulerFactory", "deprecated": false, "secret": false, "description": "To use the custom SchedulerFactory which is used to create the Scheduler." },
     "scheduler": { "kind": "property", "displayName": "Scheduler", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.quartz.Scheduler", "deprecated": false, "secret": false, "description": "To use the custom configured Quartz scheduler, instead of creating a new Scheduler." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
index d66e3ff..7bf7be1 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-api.json
@@ -20,7 +20,6 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-swagger.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-swagger.json
index 51d770f..723d61b 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-swagger.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest-swagger.json
@@ -28,8 +28,7 @@
     "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, "description": "Customize TLS parameters used by the component. If not set defaults to the TLS parameters set in the Camel context" },
     "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." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "specificationUri": { "kind": "path", "displayName": "Specification Uri", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "defaultValue": "swagger.json", "description": "Path to the Swagger specification file. The scheme, host base path are taken from this specification, but these can be overridden with properties on the component or endpoint level. If not given the component tries to loa [...]
@@ -41,7 +40,8 @@
     "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  [...]
     "produces": { "kind": "parameter", "displayName": "Produces", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "What payload type this component is producing. For example application/json according to the RFC7231. This equates to the value of Content-Type HTTP header. If set overrides any value present in the Swagger specification. Overrides all other configuration." },
     "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)." }
+    "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)." },
+    "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." }
   }
 }
 
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest.json
index 1f25e1b..0d4f966 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rest.json
@@ -43,9 +43,9 @@
     "description": { "kind": "parameter", "displayName": "Description", "group": "consumer", "label": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Human description to document this REST service" },
     "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." },
-    "apiDoc": { "kind": "parameter", "displayName": "Api Doc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The swagger api doc resource to use. The resource is loaded from classpath by default and must be in JSon format." },
+    "apiDoc": { "kind": "parameter", "displayName": "Api Doc", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The openapi api doc resource to use. The resource is loaded from classpath by default and must be in JSon format." },
     "bindingMode": { "kind": "parameter", "displayName": "Binding Mode", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.spi.RestConfiguration.RestBindingMode", "enum": [ "auto", "off", "json", "xml", "json_xml" ], "deprecated": false, "secret": false, "description": "Configures the binding mode for the producer. If set to anything other than 'off' the producer will try to convert the body of the incoming message from inType to [...]
-    "host": { "kind": "parameter", "displayName": "Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Host and port of HTTP service to use (override host in swagger schema)" },
+    "host": { "kind": "parameter", "displayName": "Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Host and port of HTTP service to use (override host in openapi schema)" },
     "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  [...]
     "producerComponentName": { "kind": "parameter", "displayName": "Producer Component Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The Camel Rest component to use for (producer) the REST transport, such as http, undertow. If no component has been explicit configured, then Camel will lookup if there is a Camel component that integrates with the Rest DSL, or if a  [...]
     "queryParameters": { "kind": "parameter", "displayName": "Query Parameters", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "multiValue": true, "deprecated": false, "secret": false, "description": "Query parameters for the HTTP service to call" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
index fc1f512..8a97676 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rss.json
@@ -21,7 +21,6 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/saga.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/saga.json
index beaac4e..2eb7995 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/saga.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/saga.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "action": { "kind": "path", "displayName": "Action", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.saga.SagaEndpoint.SagaEndpointAction", "deprecated": false, "secret": false, "description": "Action to execute (complete or compensate)" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
index 902ea4e..afad0db 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/salesforce.json
@@ -48,7 +48,7 @@
     "httpProxyExcludedAddresses": { "kind": "property", "displayName": "Http Proxy Excluded Addresses", "group": "proxy", "label": "common,proxy", "required": false, "type": "object", "javaType": "java.util.Set<java.lang.String>", "deprecated": false, "secret": false, "description": "A list of addresses for which HTTP proxy server should not be used." },
     "httpProxyAuthUri": { "kind": "property", "displayName": "Http Proxy Auth Uri", "group": "security", "label": "common,proxy,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Used in authentication against the HTTP proxy server, needs to match the URI of the proxy server in order for the httpProxyUsername and httpProxyPassword to be used for authentication." },
     "httpProxyRealm": { "kind": "property", "displayName": "Http Proxy Realm", "group": "security", "label": "common,proxy,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Realm of the proxy server, used in preemptive Basic/Digest authentication methods against the HTTP proxy server." },
-    "httpProxyUseDigestAuth": { "kind": "property", "displayName": "Http Proxy Use Digest Auth", "group": "security", "label": "common,proxy,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true Digest authentication will be used when authenticating to the HTTP proxy,otherwise Basic authorization method will be used" },
+    "httpProxyUseDigestAuth": { "kind": "property", "displayName": "Http Proxy Use Digest Auth", "group": "security", "label": "common,proxy,security", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "If set to true Digest authentication will be used when authenticating to the HTTP proxy, otherwise Basic authorization method will be used" },
     "packages": { "kind": "property", "displayName": "Packages", "group": "common", "label": "common", "required": false, "type": "array", "javaType": "java.lang.String[]", "deprecated": false, "secret": false, "description": "In what packages are the generated DTO classes. Typically the classes would be generated using camel-salesforce-maven-plugin. Set it if using the generated DTOs to gain the benefit of using short SObject names in parameters/header values." },
     "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" },
     "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 [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sap-netweaver.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sap-netweaver.json
index 36531e0..7f0fe1d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sap-netweaver.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sap-netweaver.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "url": { "kind": "path", "displayName": "Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Url to the SAP net-weaver gateway server." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scheduler.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scheduler.json
index dfc8b0b..66cdb48 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scheduler.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scheduler.json
@@ -21,7 +21,6 @@
   "componentProperties": {
     "concurrentTasks": { "kind": "property", "displayName": "Concurrent Tasks", "group": "scheduler", "label": "scheduler", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "description": "Number of threads used by the scheduling thread pool. Is by default using a single thread" },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/schematron.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/schematron.json
index db23e85..bcbc2b6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/schematron.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/schematron.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "path": { "kind": "path", "displayName": "Path", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The path to the schematron rules file. Can either be in class path or location in the file system." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scp.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scp.json
index 62be8c1..ebf4807 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scp.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/scp.json
@@ -22,8 +22,7 @@
   "componentProperties": {
     "verboseLogging": { "kind": "property", "displayName": "Verbose Logging", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "JSCH is verbose logging out of the box. Therefore we turn the logging down to DEBUG logging by default. But setting this option to true turns on the verbose logging again." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "host": { "kind": "path", "displayName": "Host", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Hostname of the FTP server" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/seda.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/seda.json
index 1ec696b..c5dc42d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/seda.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/seda.json
@@ -23,6 +23,7 @@
     "concurrentConsumers": { "kind": "property", "displayName": "Concurrent Consumers", "group": "consumer", "label": "consumer", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "description": "Sets the default number of concurrent threads processing exchanges." },
     "defaultQueueFactory": { "kind": "property", "displayName": "Default Queue Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange>", "deprecated": false, "secret": false, "description": "Sets the default queue factory." },
     "defaultBlockWhenFull": { "kind": "property", "displayName": "Default Block When Full", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, the [...]
+    "defaultDiscardWhenFull": { "kind": "property", "displayName": "Default Discard When Full", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether a thread that sends messages to a full SEDA queue will be discarded. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will give up sending an [...]
     "defaultOfferTimeout": { "kind": "property", "displayName": "Default Offer Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "description": "Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, where a configured timeout can b [...]
     "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" },
     "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 [...]
@@ -41,6 +42,7 @@
     "purgeWhenStopping": { "kind": "parameter", "displayName": "Purge When Stopping", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to purge the task queue when stopping the consumer/route. This allows to stop faster, as any pending messages on the queue is discarded." },
     "blockWhenFull": { "kind": "parameter", "displayName": "Block When Full", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling threa [...]
     "discardIfNoConsumers": { "kind": "parameter", "displayName": "Discard If No Consumers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should discard the message (do not add the message to the queue), when sending to a queue with no active consumers. Only one of the options discardIfNoConsumers and failIfNoConsumers can be enabled  [...]
+    "discardWhenFull": { "kind": "parameter", "displayName": "Discard When Full", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether a thread that sends messages to a full SEDA queue will be discarded. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will give up sending and continue, me [...]
     "failIfNoConsumers": { "kind": "parameter", "displayName": "Fail If No Consumers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should fail by throwing an exception, when sending to a queue with no active consumers. Only one of the options discardIfNoConsumers and failIfNoConsumers can be enabled at the same time." },
     "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  [...]
     "offerTimeout": { "kind": "parameter", "displayName": "Offer Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "description": "offerTimeout (in milliseconds) can be added to the block case when queue is full. You can disable timeout by using 0 or a negative value." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/service.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/service.json
index 8e8e62c..d56c0b7 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/service.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/service.json
@@ -22,7 +22,6 @@
     "service": { "kind": "property", "displayName": "Service", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.cloud.ServiceRegistry", "deprecated": false, "secret": false, "description": "Inject the service to use." },
     "serviceSelector": { "kind": "property", "displayName": "Service Selector", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.cloud.ServiceRegistry.Selector", "deprecated": false, "secret": false, "description": "Inject the service selector used to lookup the ServiceRegistry to use." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servicenow.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servicenow.json
index e148d67..3901e3d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servicenow.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servicenow.json
@@ -34,8 +34,7 @@
     "proxyPassword": { "kind": "property", "displayName": "Proxy Password", "group": "security", "label": "advanced,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "Password for proxy authentication" },
     "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." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "instanceName": { "kind": "path", "displayName": "Instance Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The ServiceNow instance name" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json
index c9d750f..23d5f74 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/servlet.json
@@ -29,7 +29,6 @@
     "allowJavaSerializedObject": { "kind": "property", "displayName": "Allow Java Serialized Object", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming [...]
     "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." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sftp.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sftp.json
index a353963..856f7f2 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sftp.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sftp.json
@@ -77,8 +77,8 @@
     "maximumReconnectAttempts": { "kind": "parameter", "displayName": "Maximum Reconnect Attempts", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Specifies the maximum reconnect attempts Camel performs when it tries to connect to the remote FTP server. Use 0 to disable this behavior." },
     "proxy": { "kind": "parameter", "displayName": "Proxy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "com.jcraft.jsch.Proxy", "deprecated": false, "secret": false, "description": "To use a custom configured com.jcraft.jsch.Proxy. This proxy is used to consume/send messages from the target SFTP host." },
     "reconnectDelay": { "kind": "parameter", "displayName": "Reconnect Delay", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "description": "Delay in millis Camel will wait before performing a reconnect attempt." },
-    "serverAliveCountMax": { "kind": "parameter", "displayName": "Server Alive Count Max", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Allows you to set the serverAliveCountMax of the sftp session" },
-    "serverAliveInterval": { "kind": "parameter", "displayName": "Server Alive Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Allows you to set the serverAliveInterval of the sftp session" },
+    "serverAliveCountMax": { "kind": "parameter", "displayName": "Server Alive Count Max", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets the number of keep-alive messages which may be sent without receiving any messages back from the server [...]
+    "serverAliveInterval": { "kind": "parameter", "displayName": "Server Alive Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets the interval (millis) to send a keep-alive message. If zero is specified, any keep-alive message must not be sent. The defa [...]
     "soTimeout": { "kind": "parameter", "displayName": "So Timeout", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 300000, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets the so timeout FTP and FTPS Only for Camel 2.4. SFTP for Camel 2.14.3/2.15.3/2.16 onwards. Is the SocketOptions.SO_TIMEO [...]
     "stepwise": { "kind": "parameter", "displayName": "Stepwise", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "configurationClass": "org.apache.camel.component.file.remote.SftpConfiguration", "configurationField": "configuration", "description": "Sets whether we should stepwise change directories while traversing file structures when downloading files, or as well when up [...]
     "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)." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sjms-batch.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sjms-batch.json
index bd1ccb6..bd768cc 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sjms-batch.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sjms-batch.json
@@ -24,7 +24,6 @@
     "recoveryInterval": { "kind": "property", "displayName": "Recovery Interval", "group": "advanced", "label": "advanced", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 5000, "description": "Specifies the interval between recovery attempts, i.e. when a connection is being refreshed, in milliseconds. The default is 5000 ms, that is, 5 seconds." },
     "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." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solr.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solr.json
index 7d6a01a..27ba285 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solr.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solr.json
@@ -21,8 +21,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "url": { "kind": "path", "displayName": "Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Hostname and port for the solr server" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solrCloud.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solrCloud.json
index f6007b7..9fff9e8 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solrCloud.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solrCloud.json
@@ -21,8 +21,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "url": { "kind": "path", "displayName": "Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Hostname and port for the solr server" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solrs.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solrs.json
index 8661fc8..ba6f5a6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solrs.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/solrs.json
@@ -21,8 +21,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "url": { "kind": "path", "displayName": "Url", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Hostname and port for the solr server" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/soroush.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/soroush.json
index 3910722..ecf17d4 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/soroush.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/soroush.json
@@ -41,13 +41,13 @@
     "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": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." },
-    "authorizationToken": { "kind": "parameter", "displayName": "Authorization Token", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "The authorization token for using the bot. if uri path does not contain authorization token, this token will be used." },
     "backOffStrategy": { "kind": "parameter", "displayName": "Back Off Strategy", "group": "scheduling", "label": "scheduling", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "Exponential", "description": "The strategy to backoff in case of connection failure. Currently 3 strategies are supported: 1. Exponential (default): It multiply retryWaitingTime by retryExponentialCoefficient after each connection failure.  [...]
     "maxRetryWaitingTime": { "kind": "parameter", "displayName": "Max Retry Waiting Time", "group": "scheduling", "label": "scheduling", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 3600000, "description": "Maximum amount of time (in millisecond) a thread wait before retrying failed request." },
     "reconnectIdleConnectionTimeout": { "kind": "parameter", "displayName": "Reconnect Idle Connection Timeout", "group": "scheduling", "label": "scheduling", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 300000, "description": "The timeout in millisecond to reconnect the existing getMessage connection to ensure that the connection is always live and does not dead without notifying the bot. this value should not be changed." },
     "retryExponentialCoefficient": { "kind": "parameter", "displayName": "Retry Exponential Coefficient", "group": "scheduling", "label": "scheduling", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 2, "description": "Coefficient to compute back off time when using Exponential Back Off strategy" },
     "retryLinearIncrement": { "kind": "parameter", "displayName": "Retry Linear Increment", "group": "scheduling", "label": "scheduling", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 10000, "description": "The amount of time (in millisecond) which adds to waiting time when using Linear back off strategy" },
-    "retryWaitingTime": { "kind": "parameter", "displayName": "Retry Waiting Time", "group": "scheduling", "label": "scheduling", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 1000, "description": "Waiting time before retry failed request (Millisecond). If backOffStrategy is not Fixed this is the based value for computing back off waiting time. the first retry is always happen immediately after failure and retryWaitingTime [...]
+    "retryWaitingTime": { "kind": "parameter", "displayName": "Retry Waiting Time", "group": "scheduling", "label": "scheduling", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 1000, "description": "Waiting time before retry failed request (Millisecond). If backOffStrategy is not Fixed this is the based value for computing back off waiting time. the first retry is always happen immediately after failure and retryWaitingTime [...]
+    "authorizationToken": { "kind": "parameter", "displayName": "Authorization Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "The authorization token for using the bot. if uri path does not contain authorization token, this token will be used." }
   }
 }
 
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spark.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spark.json
index a07b398..7d8323c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spark.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spark.json
@@ -22,8 +22,7 @@
     "rdd": { "kind": "property", "displayName": "Rdd", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.spark.api.java.JavaRDDLike", "deprecated": false, "secret": false, "description": "RDD to compute against." },
     "rddCallback": { "kind": "property", "displayName": "Rdd Callback", "group": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.component.spark.RddCallback", "deprecated": false, "secret": false, "description": "Function performing action against an RDD." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "endpointType": { "kind": "path", "displayName": "Endpoint Type", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.spark.EndpointType", "enum": [ "rdd", "dataframe", "hive" ], "deprecated": false, "secret": false, "description": "Type of the endpoint (rdd, dataframe, hive)." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-batch.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-batch.json
index a7f4b11..4be97d8 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-batch.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-batch.json
@@ -22,8 +22,7 @@
     "jobLauncher": { "kind": "property", "displayName": "Job Launcher", "group": "producer", "required": false, "type": "object", "javaType": "org.springframework.batch.core.launch.JobLauncher", "deprecated": false, "secret": false, "description": "Explicitly specifies a JobLauncher to be used." },
     "jobRegistry": { "kind": "property", "displayName": "Job Registry", "group": "producer", "required": false, "type": "object", "javaType": "org.springframework.batch.core.configuration.JobRegistry", "deprecated": false, "secret": false, "description": "Explicitly specifies a JobRegistry to be used." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "jobName": { "kind": "path", "displayName": "Job Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The name of the Spring Batch job located in the registry." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ldap.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ldap.json
index 9e56140..ef5842c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ldap.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/spring-ldap.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "templateName": { "kind": "path", "displayName": "Template Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of the Spring LDAP Template bean" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql-stored.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql-stored.json
index f25ff6f..31a8063 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql-stored.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/sql-stored.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "dataSource": { "kind": "property", "displayName": "Data Source", "group": "producer", "required": false, "type": "object", "javaType": "javax.sql.DataSource", "deprecated": false, "secret": false, "description": "Sets the DataSource to use to communicate with the database." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "template": { "kind": "path", "displayName": "Template", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the StoredProcedure template to perform" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stax.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stax.json
index 8bcecbe..5aeffd6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stax.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stax.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "contentHandlerClass": { "kind": "path", "displayName": "Content Handler Class", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The FQN class name for the ContentHandler implementation to use." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stomp.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stomp.json
index fe8b407..e13f3c6 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stomp.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stomp.json
@@ -33,7 +33,9 @@
   "properties": {
     "destination": { "kind": "path", "displayName": "Destination", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Name of the queue" },
     "brokerURL": { "kind": "parameter", "displayName": "Broker URL", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "tcp://localhost:61613", "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The URI of the Stomp broker to connect to" },
+    "customHeaders": { "kind": "parameter", "displayName": "Custom Headers", "group": "common", "required": false, "type": "object", "javaType": "java.util.Properties", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "To set custom headers" },
     "host": { "kind": "parameter", "displayName": "Host", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The virtual host name" },
+    "version": { "kind": "parameter", "displayName": "Version", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.stomp.StompConfiguration", "configurationField": "configuration", "description": "The stomp version (1.1, or 1.2)" },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "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." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/string-template.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/string-template.json
index 630b9a9..fcf9b78 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/string-template.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/string-template.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stub.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stub.json
index acd0eec..71dbf4c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stub.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/stub.json
@@ -23,6 +23,7 @@
     "concurrentConsumers": {"kind":"property","displayName":"Concurrent Consumers","group":"consumer","label":"consumer","required":false,"type":"integer","javaType":"int","deprecated":false,"secret":false,"defaultValue":1,"description":"Sets the default number of concurrent threads processing exchanges."},
     "defaultQueueFactory": {"kind":"property","displayName":"Default Queue Factory","group":"advanced","label":"advanced","required":false,"type":"object","javaType":"org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange>","deprecated":false,"secret":false,"description":"Sets the default queue factory."},
     "defaultBlockWhenFull": {"kind":"property","displayName":"Default Block When Full","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will i [...]
+    "defaultDiscardWhenFull": {"kind":"property","displayName":"Default Discard When Full","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether a thread that sends messages to a full SEDA queue will be discarded. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will give up sending and continue, meaning th [...]
     "defaultOfferTimeout": {"kind":"property","displayName":"Default Offer Timeout","group":"producer","label":"producer","required":false,"type":"integer","javaType":"long","deprecated":false,"secret":false,"description":"Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, where a configured timeout can be added to the block [...]
     "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"},
     "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 route to fail being sta [...]
@@ -41,6 +42,7 @@
     "purgeWhenStopping": {"kind":"parameter","displayName":"Purge When Stopping","group":"consumer (advanced)","label":"consumer,advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether to purge the task queue when stopping the consumer\/route. This allows to stop faster, as any pending messages on the queue is discarded."},
     "blockWhenFull": {"kind":"parameter","displayName":"Block When Full","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will instead block a [...]
     "discardIfNoConsumers": {"kind":"parameter","displayName":"Discard If No Consumers","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether the producer should discard the message (do not add the message to the queue), when sending to a queue with no active consumers. Only one of the options discardIfNoConsumers and failIfNoConsumers can be enabled at the same time."},
+    "discardWhenFull": {"kind":"parameter","displayName":"Discard When Full","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether a thread that sends messages to a full SEDA queue will be discarded. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will give up sending and continue, meaning that the message [...]
     "failIfNoConsumers": {"kind":"parameter","displayName":"Fail If No Consumers","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether the producer should fail by throwing an exception, when sending to a queue with no active consumers. Only one of the options discardIfNoConsumers and failIfNoConsumers can be enabled at the same time."},
     "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 route to fail being st [...]
     "offerTimeout": {"kind":"parameter","displayName":"Offer Timeout","group":"producer","label":"producer","required":false,"type":"integer","javaType":"long","deprecated":false,"secret":false,"description":"offerTimeout (in milliseconds) can be added to the block case when queue is full. You can disable timeout by using 0 or a negative value."},
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/telegram.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/telegram.json
index 56fd448..0251110 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/telegram.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/telegram.json
@@ -20,6 +20,9 @@
   },
   "componentProperties": {
     "authorizationToken": { "kind": "property", "displayName": "Authorization Token", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "The default Telegram authorization token to be used when the information is not provided in the endpoints." },
+    "client": { "kind": "property", "displayName": "Client", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.asynchttpclient.AsyncHttpClient", "deprecated": false, "secret": false, "description": "To use a custom AsyncHttpClient" },
+    "clientConfig": { "kind": "property", "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." },
+    "baseUri": { "kind": "property", "displayName": "Base Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "https://api.telegram.org", "description": "Set an alternative base URI, e.g. when you want to test the component against a mock Telegram API." },
     "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" },
     "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 [...]
     "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 [...]
@@ -35,7 +38,10 @@
     "pollStrategy": { "kind": "parameter", "displayName": "Poll Strategy", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.PollingConsumerPollStrategy", "deprecated": false, "secret": false, "description": "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange h [...]
     "chatId": { "kind": "parameter", "displayName": "Chat Id", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.telegram.TelegramConfiguration", "configurationField": "configuration", "description": "The identifier of the chat that will receive the produced messages. Chat ids can be first obtained from incoming messages (eg. when a telegram [...]
     "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  [...]
+    "baseUri": { "kind": "parameter", "displayName": "Base Uri", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.telegram.TelegramConfiguration", "configurationField": "configuration", "description": "Set an alternative base URI, e.g. when you want to test the component against a mock Telegram API." },
     "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" },
+    "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)." },
     "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." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/tika.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/tika.json
index 3e89e09..8a76254 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/tika.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/tika.json
@@ -20,8 +20,7 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "operation": { "kind": "path", "displayName": "Operation", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.tika.TikaOperation", "enum": [ "parse", "detect" ], "deprecated": false, "secret": false, "description": "Tika Operation - parse or detect" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/timer.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/timer.json
index 57fc2af..5213d8c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/timer.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/timer.json
@@ -20,7 +20,6 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
index fb4fd60..cc94033 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/undertow.json
@@ -41,7 +41,7 @@
     "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." },
     "handlers": { "kind": "parameter", "displayName": "Handlers", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Specifies a comma-delimited set of io.undertow.server.HttpHandler instances in your Registry (such as your Spring ApplicationContext). These handlers are added to the Undertow handler chain (for example, to add security). Important: You can  [...]
-    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.common.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
+    "cookieHandler": { "kind": "parameter", "displayName": "Cookie Handler", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.apache.camel.http.base.cookie.CookieHandler", "deprecated": false, "secret": false, "description": "Configure a cookie handler to maintain a HTTP session" },
     "keepAlive": { "kind": "parameter", "displayName": "Keep Alive", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Setting to ensure socket is not closed due to inactivity" },
     "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  [...]
     "options": { "kind": "parameter", "displayName": "Options", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "option.", "multiValue": true, "deprecated": false, "secret": false, "description": "Sets additional channel options. The options that can be used are defined in org.xnio.Options. To configure from endpoint uri, then prefix each option with option., such as option.close-abor [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/validator.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/validator.json
index 589dc85..a17b814 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/validator.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/validator.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "resourceResolverFactory": { "kind": "property", "displayName": "Resource Resolver Factory", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.validator.ValidatorResourceResolverFactory", "deprecated": false, "secret": false, "description": "To use a custom LSResourceResolver which depends on a dynamic endpoint resource URI" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "URL to a local resource on the classpath,or a reference to lookup a bean in the Registry, or a full URL to a remote resource or resource on the file system which contains the XSD to validate against." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/velocity.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/velocity.json
index f975aec..17c8629 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/velocity.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/velocity.json
@@ -21,8 +21,7 @@
   "componentProperties": {
     "velocityEngine": { "kind": "property", "displayName": "Velocity Engine", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.velocity.app.VelocityEngine", "deprecated": false, "secret": false, "description": "To use the VelocityEngine otherwise a new engine is created" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vm.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vm.json
index e7df525..904c496 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vm.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vm.json
@@ -23,6 +23,7 @@
     "concurrentConsumers": {"kind":"property","displayName":"Concurrent Consumers","group":"consumer","label":"consumer","required":false,"type":"integer","javaType":"int","deprecated":false,"secret":false,"defaultValue":1,"description":"Sets the default number of concurrent threads processing exchanges."},
     "defaultQueueFactory": {"kind":"property","displayName":"Default Queue Factory","group":"advanced","label":"advanced","required":false,"type":"object","javaType":"org.apache.camel.component.seda.BlockingQueueFactory<org.apache.camel.Exchange>","deprecated":false,"secret":false,"description":"Sets the default queue factory."},
     "defaultBlockWhenFull": {"kind":"property","displayName":"Default Block When Full","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will i [...]
+    "defaultDiscardWhenFull": {"kind":"property","displayName":"Default Discard When Full","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether a thread that sends messages to a full SEDA queue will be discarded. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will give up sending and continue, meaning th [...]
     "defaultOfferTimeout": {"kind":"property","displayName":"Default Offer Timeout","group":"producer","label":"producer","required":false,"type":"integer","javaType":"long","deprecated":false,"secret":false,"description":"Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, where a configured timeout can be added to the block [...]
     "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"},
     "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 route to fail being sta [...]
@@ -41,6 +42,7 @@
     "purgeWhenStopping": {"kind":"parameter","displayName":"Purge When Stopping","group":"consumer (advanced)","label":"consumer,advanced","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether to purge the task queue when stopping the consumer\/route. This allows to stop faster, as any pending messages on the queue is discarded."},
     "blockWhenFull": {"kind":"parameter","displayName":"Block When Full","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will instead block a [...]
     "discardIfNoConsumers": {"kind":"parameter","displayName":"Discard If No Consumers","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether the producer should discard the message (do not add the message to the queue), when sending to a queue with no active consumers. Only one of the options discardIfNoConsumers and failIfNoConsumers can be enabled at the same time."},
+    "discardWhenFull": {"kind":"parameter","displayName":"Discard When Full","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether a thread that sends messages to a full SEDA queue will be discarded. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will give up sending and continue, meaning that the message [...]
     "failIfNoConsumers": {"kind":"parameter","displayName":"Fail If No Consumers","group":"producer","label":"producer","required":false,"type":"boolean","javaType":"boolean","deprecated":false,"secret":false,"defaultValue":false,"description":"Whether the producer should fail by throwing an exception, when sending to a queue with no active consumers. Only one of the options discardIfNoConsumers and failIfNoConsumers can be enabled at the same time."},
     "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 route to fail being st [...]
     "offerTimeout": {"kind":"parameter","displayName":"Offer Timeout","group":"producer","label":"producer","required":false,"type":"integer","javaType":"long","deprecated":false,"secret":false,"description":"offerTimeout (in milliseconds) can be added to the block case when queue is full. You can disable timeout by using 0 or a negative value."},
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/web3j.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/web3j.json
index 3c3ccfe..9b5685a 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/web3j.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/web3j.json
@@ -28,20 +28,20 @@
     "nodeAddress": { "kind": "path", "displayName": "Node Address", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Sets the node address used to communicate" },
     "addresses": { "kind": "parameter", "displayName": "Addresses", "group": "common", "label": "common", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "Contract address or a list of addresses." },
     "fromAddress": { "kind": "parameter", "displayName": "From Address", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The address the transaction is send from" },
-    "fromBlock": { "kind": "parameter", "displayName": "From Block", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.web3j.protocol.core.DefaultBlockParameter", "deprecated": false, "secret": false, "defaultValue": "latest", "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The block number, or the string latest for the last mined block or pending, earliest for no [...]
+    "fromBlock": { "kind": "parameter", "displayName": "From Block", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "latest", "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The block number, or the string latest for the last mined block or pending, earliest for not yet mined transactions." },
     "fullTransactionObjects": { "kind": "parameter", "displayName": "Full Transaction Objects", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "If true it returns the full transaction objects, if false only the hashes of the transactions." },
     "gasLimit": { "kind": "parameter", "displayName": "Gas Limit", "group": "common", "required": false, "type": "object", "javaType": "java.math.BigInteger", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The maximum gas allowed in this block." },
     "privateFor": { "kind": "parameter", "displayName": "Private For", "group": "common", "label": "common", "required": false, "type": "array", "javaType": "java.util.List<java.lang.String>", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "A transaction privateFor nodes with public keys in a Quorum network" },
     "quorumAPI": { "kind": "parameter", "displayName": "Quorum API", "group": "common", "label": "common", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "If true, this will support Quorum API." },
     "toAddress": { "kind": "parameter", "displayName": "To Address", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The address the transaction is directed to." },
-    "toBlock": { "kind": "parameter", "displayName": "To Block", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.web3j.protocol.core.DefaultBlockParameter", "deprecated": false, "secret": false, "defaultValue": "latest", "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The block number, or the string latest for the last mined block or pending, earliest for not ye [...]
+    "toBlock": { "kind": "parameter", "displayName": "To Block", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "latest", "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The block number, or the string latest for the last mined block or pending, earliest for not yet mined transactions." },
     "topics": { "kind": "parameter", "displayName": "Topics", "group": "common", "label": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "Topics are order-dependent. Each topic can also be a list of topics. Specify multiple topics separated by comma." },
     "web3j": { "kind": "parameter", "displayName": "Web3j", "group": "common", "label": "common", "required": false, "type": "object", "javaType": "org.web3j.protocol.Web3j", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The preconfigured Web3j object." },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "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." },
     "address": { "kind": "parameter", "displayName": "Address", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "Contract address." },
-    "atBlock": { "kind": "parameter", "displayName": "At Block", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "org.web3j.protocol.core.DefaultBlockParameter", "deprecated": false, "secret": false, "defaultValue": "latest", "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The block number, or the string latest for the last mined block or pending, earliest for no [...]
+    "atBlock": { "kind": "parameter", "displayName": "At Block", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "latest", "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The block number, or the string latest for the last mined block or pending, earliest for not yet mined transactions." },
     "blockHash": { "kind": "parameter", "displayName": "Block Hash", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "Hash of the block where this transaction was in." },
     "clientId": { "kind": "parameter", "displayName": "Client Id", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "A random hexadecimal(32 bytes) ID identifying the client." },
     "data": { "kind": "parameter", "displayName": "Data", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.web3j.Web3jConfiguration", "configurationField": "configuration", "description": "The compiled code of a contract OR the hash of the invoked method signature and encoded parameters." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/webhook.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/webhook.json
index bb6755e..f478e84 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/webhook.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/webhook.json
@@ -21,7 +21,6 @@
   "componentProperties": {
     "configuration": { "kind": "property", "displayName": "Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.webhook.WebhookConfiguration", "deprecated": false, "secret": false, "description": "Set the default configuration for the webhook meta-component." },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/websocket-jsr356.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/websocket-jsr356.json
index ba62af7..0882afc 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/websocket-jsr356.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/websocket-jsr356.json
@@ -2,10 +2,10 @@
  "component": {
     "kind": "component",
     "scheme": "websocket-jsr356",
-    "syntax": "websocket-jsr356:websocketPathOrUri",
+    "syntax": "websocket-jsr356:uri",
     "title": "Javax Websocket",
     "description": "Camel WebSocket using JSR356 (javax)",
-    "label": "jsr356",
+    "label": "http",
     "deprecated": false,
     "deprecationNote": "",
     "async": false,
@@ -24,8 +24,8 @@
     "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 [...]
   },
   "properties": {
-    "websocketPathOrUri": { "kind": "path", "displayName": "Websocket Path Or Uri", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "If a path (/foo) it will deploy locally the endpoint, if an uri it will connect to the corresponding server" },
-    "sessionCount": { "kind": "parameter", "displayName": "Session Count", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "description": "Used when the endpoint is in client mode to populate a pool of sessions" },
+    "uri": { "kind": "path", "displayName": "Uri", "group": "common", "required": false, "type": "string", "javaType": "java.net.URI", "deprecated": false, "secret": false, "description": "If a schemeless URI path is provided, a ServerEndpoint is deployed under that path. Else if the URI is prefixed with the 'ws://' scheme, then a connection is established to the corresponding server" },
+    "sessionCount": { "kind": "parameter", "displayName": "Session Count", "group": "common", "required": false, "type": "integer", "javaType": "int", "deprecated": false, "secret": false, "defaultValue": 1, "description": "Used when the endpoint is in client mode to populate a pool of sessions" },
     "bridgeErrorHandler": { "kind": "parameter", "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 b [...]
     "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." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/wordpress.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/wordpress.json
index 4af9c83..97c643c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/wordpress.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/wordpress.json
@@ -25,7 +25,7 @@
     "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 [...]
   },
   "properties": {
-    "operation": { "kind": "path", "displayName": "Operation", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "post", " user" ], "deprecated": false, "secret": false, "description": "The endpoint operation." },
+    "operation": { "kind": "path", "displayName": "Operation", "group": "common", "required": true, "type": "string", "javaType": "java.lang.String", "enum": [ "post", "user" ], "deprecated": false, "secret": false, "description": "The endpoint operation." },
     "operationDetail": { "kind": "path", "displayName": "Operation Detail", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "delete" ], "deprecated": false, "secret": false, "description": "The second part of an endpoint operation. Needed only when endpoint semantic is not enough, like wordpress:post:delete" },
     "apiVersion": { "kind": "parameter", "displayName": "Api Version", "group": "common", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "2", "configurationClass": "org.apache.camel.component.wordpress.WordpressComponentConfiguration", "configurationField": "configuration", "description": "The Wordpress REST API version" },
     "criteria": { "kind": "parameter", "displayName": "Criteria", "group": "common", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String,java.lang.Object>", "prefix": "criteria.", "multiValue": true, "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.wordpress.WordpressComponentConfiguration", "configurationField": "configuration", "description": "The criteria to use with complex searches." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xchange.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xchange.json
index 2108d5a..2bf339c 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xchange.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xchange.json
@@ -20,13 +20,12 @@
   },
   "componentProperties": {
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "name": { "kind": "path", "displayName": "Name", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The exchange to connect to" },
     "currency": { "kind": "parameter", "displayName": "Currency", "group": "producer", "required": false, "type": "object", "javaType": "org.knowm.xchange.currency.Currency", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xchange.XChangeConfiguration", "configurationField": "configuration", "description": "The currency" },
-    "currencyPair": { "kind": "parameter", "displayName": "Currency Pair", "group": "producer", "required": false, "type": "object", "javaType": "org.knowm.xchange.currency.CurrencyPair", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xchange.XChangeConfiguration", "configurationField": "configuration", "description": "The currency pair" },
+    "currencyPair": { "kind": "parameter", "displayName": "Currency Pair", "group": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xchange.XChangeConfiguration", "configurationField": "configuration", "description": "The currency pair" },
     "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  [...]
     "method": { "kind": "parameter", "displayName": "Method", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.xchange.XChangeConfiguration.XChangeMethod", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xchange.XChangeConfiguration", "configurationField": "configuration", "description": "The method to execute" },
     "service": { "kind": "parameter", "displayName": "Service", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.xchange.XChangeConfiguration.XChangeService", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.xchange.XChangeConfiguration", "configurationField": "configuration", "description": "The service to call" },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
index 070da74..a52c492 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
@@ -28,8 +28,7 @@
     "transformerFactoryConfigurationStrategy": {"kind":"property","displayName":"Transformer Factory Configuration Strategy","group":"advanced","label":"advanced","required":false,"type":"object","javaType":"org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy","deprecated":false,"secret":false,"description":"A configuration strategy to apply on freshly created instances of TransformerFactory."},
     "transformerFactoryClass": {"kind":"property","displayName":"Transformer Factory Class","group":"advanced","label":"advanced","required":false,"type":"string","javaType":"java.lang.String","deprecated":false,"secret":false,"description":"To use a custom XSLT transformer factory, specified as a FQN class name"},
     "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"},
-    "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 route to fail being sta [...]
-    "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 the routing Error Han [...]
+    "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 route to fail being sta [...]
   },
   "properties": {
     "transformDirection": { "kind": "parameter", "displayName": "Transform Direction", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.xj.TransformDirection", "enum": [ "XML2JSON", "JSON2XML" ], "deprecated": false, "secret": false, "description": "Sets the transform direction." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xmlsecurity.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xmlsecurity.json
index 984076a..30892e5 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xmlsecurity.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xmlsecurity.json
@@ -22,8 +22,7 @@
     "signerConfiguration": { "kind": "property", "displayName": "Signer Configuration", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.processor.XmlSignerConfiguration", "deprecated": false, "secret": false, "description": "To use a shared XmlSignerConfiguration configuration to use as base for configuring endpoints." },
     "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." },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "command": { "kind": "path", "displayName": "Command", "group": "producer", "required": true, "type": "object", "javaType": "org.apache.camel.component.xmlsecurity.XmlCommand", "enum": [ "sign", "verify" ], "deprecated": false, "secret": false, "description": "Whether to sign or verify." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt-saxon.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt-saxon.json
index 051ee67..1e20ed9 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt-saxon.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt-saxon.json
@@ -28,8 +28,7 @@
     "transformerFactoryConfigurationStrategy": {"kind":"property","displayName":"Transformer Factory Configuration Strategy","group":"advanced","label":"advanced","required":false,"type":"object","javaType":"org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy","deprecated":false,"secret":false,"description":"A configuration strategy to apply on freshly created instances of TransformerFactory."},
     "transformerFactoryClass": {"kind":"property","displayName":"Transformer Factory Class","group":"advanced","label":"advanced","required":false,"type":"string","javaType":"java.lang.String","deprecated":false,"secret":false,"description":"To use a custom XSLT transformer factory, specified as a FQN class name"},
     "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"},
-    "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 route to fail being sta [...]
-    "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 the routing Error Han [...]
+    "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 route to fail being sta [...]
   },
   "properties": {
     "allowStAX": { "kind": "parameter", "displayName": "Allow StAX", "group": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether to allow using StAX as the javax.xml.transform.Source. You can enable this if the XSLT library supports StAX such as the Saxon library (camel-saxon). The Xalan library (default in JVM) does not support StAXSource." },
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt.json
index ae26dda..cda2da8 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt.json
@@ -25,8 +25,7 @@
     "transformerFactoryConfigurationStrategy": { "kind": "property", "displayName": "Transformer Factory Configuration Strategy", "group": "advanced", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy", "deprecated": false, "secret": false, "description": "A configuration strategy to apply on freshly created instances of TransformerFactory." },
     "transformerFactoryClass": { "kind": "property", "displayName": "Transformer Factory Class", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "To use a custom XSLT transformer factory, specified as a FQN class name" },
     "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" },
-    "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 [...]
-    "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 [...]
   },
   "properties": {
     "resourceUri": { "kind": "path", "displayName": "Resource Uri", "group": "producer", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "Path to the template. The following is supported by the default URIResolver. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will  [...]
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zookeeper-master.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zookeeper-master.json
index 33fdb73..ed34012 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zookeeper-master.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/zookeeper-master.json
@@ -26,7 +26,6 @@
     "zooKeeperUrl": { "kind": "property", "displayName": "Zoo Keeper Url", "group": "consumer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "localhost:2181", "description": "The url for the zookeeper ensemble" },
     "zooKeeperPassword": { "kind": "property", "displayName": "Zoo Keeper Password", "group": "security", "label": "security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "description": "The password to use when connecting to the zookeeper ensemble" },
     "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" },
-    "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 [...]
     "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 [...]
   },
   "properties": {
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-consul.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-consul.json
index cab9ef1..127b65d 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-consul.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-consul.json
@@ -9,6 +9,6 @@
     "label": "spring,microservice",
     "groupId": "org.apache.camel.springboot",
     "artifactId": "camel-spring-cloud-consul-starter",
-    "version": "1.0.0-SNAPSHOT"
+    "version": "3.1.0-SNAPSHOT"
   }
 }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-netflix.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-netflix.json
index faa56f3..bf1e0c9 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-netflix.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-netflix.json
@@ -9,6 +9,6 @@
     "label": "spring,microservice",
     "groupId": "org.apache.camel.springboot",
     "artifactId": "camel-spring-cloud-netflix-starter",
-    "version": "1.0.0-SNAPSHOT"
+    "version": "3.1.0-SNAPSHOT"
   }
 }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-zookeeper.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-zookeeper.json
index a6cf51b..333f765 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-zookeeper.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud-zookeeper.json
@@ -9,6 +9,6 @@
     "label": "spring,microservice",
     "groupId": "org.apache.camel.springboot",
     "artifactId": "camel-spring-cloud-zookeeper-starter",
-    "version": "1.0.0-SNAPSHOT"
+    "version": "3.1.0-SNAPSHOT"
   }
 }
diff --git a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud.json b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud.json
index 7419b52..3ea8634 100644
--- a/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud.json
+++ b/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others/spring-cloud.json
@@ -9,6 +9,6 @@
     "label": "spring,microservice",
     "groupId": "org.apache.camel.springboot",
     "artifactId": "camel-spring-cloud-starter",
-    "version": "1.0.0-SNAPSHOT"
+    "version": "3.1.0-SNAPSHOT"
   }
 }
diff --git a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
index 50450db..0c53957 100644
--- a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
+++ b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
@@ -76,6 +76,20 @@ public class ActiveMQComponentConfiguration
      */
     private String configuration;
     /**
+     * Whether to auto-discover ConnectionFactory from the registry, if no
+     * connection factory has been configured. If only one instance of
+     * ConnectionFactory is found then it will be used. This is enabled by
+     * default.
+     */
+    private Boolean allowAutoWiredConnectionFactory = false;
+    /**
+     * Whether to auto-discover DestinationResolver from the registry, if no
+     * destination resolver has been configured. If only one instance of
+     * DestinationResolver is found then it will be used. This is enabled by
+     * default.
+     */
+    private Boolean allowAutoWiredDestinationResolver = false;
+    /**
      * Specifies whether the consumer accept messages while it is stopping. You
      * may consider enabling this option, if you start and stop JMS routes at
      * runtime, while there are still messages enqueued on the queue. If this
@@ -708,6 +722,24 @@ public class ActiveMQComponentConfiguration
         this.configuration = configuration;
     }
 
+    public Boolean getAllowAutoWiredConnectionFactory() {
+        return allowAutoWiredConnectionFactory;
+    }
+
+    public void setAllowAutoWiredConnectionFactory(
+            Boolean allowAutoWiredConnectionFactory) {
+        this.allowAutoWiredConnectionFactory = allowAutoWiredConnectionFactory;
+    }
+
+    public Boolean getAllowAutoWiredDestinationResolver() {
+        return allowAutoWiredDestinationResolver;
+    }
+
+    public void setAllowAutoWiredDestinationResolver(
+            Boolean allowAutoWiredDestinationResolver) {
+        this.allowAutoWiredDestinationResolver = allowAutoWiredDestinationResolver;
+    }
+
     public Boolean getAcceptMessagesWhileStopping() {
         return acceptMessagesWhileStopping;
     }
diff --git a/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java b/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java
index f1821b0..cf2e4cb 100644
--- a/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java
+++ b/components-starter/camel-ahc-starter/src/main/java/org/apache/camel/component/ahc/springboot/AhcComponentConfiguration.java
@@ -95,15 +95,6 @@ public class AhcComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getClient() {
         return client;
@@ -177,12 +168,4 @@ public class AhcComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java b/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java
index 7d40873..a2f695f 100644
--- a/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java
+++ b/components-starter/camel-ahc-ws-starter/src/main/java/org/apache/camel/component/ahc/ws/springboot/WsComponentConfiguration.java
@@ -95,15 +95,6 @@ public class WsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getClient() {
         return client;
@@ -177,12 +168,4 @@ public class WsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
index 9bd11c1..1c9924f 100644
--- a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
+++ b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
@@ -48,6 +48,20 @@ public class AMQPComponentConfiguration
      */
     private Boolean includeAmqpAnnotations = false;
     /**
+     * Whether to auto-discover ConnectionFactory from the registry, if no
+     * connection factory has been configured. If only one instance of
+     * ConnectionFactory is found then it will be used. This is enabled by
+     * default.
+     */
+    private Boolean allowAutoWiredConnectionFactory = false;
+    /**
+     * Whether to auto-discover DestinationResolver from the registry, if no
+     * destination resolver has been configured. If only one instance of
+     * DestinationResolver is found then it will be used. This is enabled by
+     * default.
+     */
+    private Boolean allowAutoWiredDestinationResolver = false;
+    /**
      * To use a shared JMS configuration. The option is a
      * org.apache.camel.component.jms.JmsConfiguration type.
      */
@@ -653,6 +667,24 @@ public class AMQPComponentConfiguration
         this.includeAmqpAnnotations = includeAmqpAnnotations;
     }
 
+    public Boolean getAllowAutoWiredConnectionFactory() {
+        return allowAutoWiredConnectionFactory;
+    }
+
+    public void setAllowAutoWiredConnectionFactory(
+            Boolean allowAutoWiredConnectionFactory) {
+        this.allowAutoWiredConnectionFactory = allowAutoWiredConnectionFactory;
+    }
+
+    public Boolean getAllowAutoWiredDestinationResolver() {
+        return allowAutoWiredDestinationResolver;
+    }
+
+    public void setAllowAutoWiredDestinationResolver(
+            Boolean allowAutoWiredDestinationResolver) {
+        this.allowAutoWiredDestinationResolver = allowAutoWiredDestinationResolver;
+    }
+
     public String getConfiguration() {
         return configuration;
     }
diff --git a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
index e07b506..5c04afa 100644
--- a/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
+++ b/components-starter/camel-atmosphere-websocket-starter/src/main/java/org/apache/camel/component/atmosphere/websocket/springboot/WebsocketComponentConfiguration.java
@@ -90,17 +90,6 @@ public class WebsocketComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -182,14 +171,6 @@ public class WebsocketComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentConfiguration.java b/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentConfiguration.java
index f9d2a97..f2fe5b3 100644
--- a/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentConfiguration.java
+++ b/components-starter/camel-atom-starter/src/main/java/org/apache/camel/component/atom/springboot/AtomComponentConfiguration.java
@@ -42,17 +42,6 @@ public class AtomComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -70,14 +59,6 @@ public class AtomComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConfiguration.java b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConfiguration.java
index d3ce5c6..50c1d27 100644
--- a/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConfiguration.java
+++ b/components-starter/camel-atomix-starter/src/main/java/org/apache/camel/component/atomix/client/multimap/springboot/AtomixMultiMapComponentConfiguration.java
@@ -73,15 +73,6 @@ public class AtomixMultiMapComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public AtomixMultiMapConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -132,14 +123,6 @@ public class AtomixMultiMapComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class AtomixMultiMapConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConfiguration.java b/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConfiguration.java
index b26fc5d..8873968 100644
--- a/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConfiguration.java
+++ b/components-starter/camel-aws-cw-starter/src/main/java/org/apache/camel/component/aws/cw/springboot/CwComponentConfiguration.java
@@ -71,15 +71,6 @@ public class CwComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public CwConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class CwComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class CwConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.cw.CwConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConfiguration.java b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConfiguration.java
index be7bb61..5b74a42 100644
--- a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConfiguration.java
+++ b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddb/springboot/DdbComponentConfiguration.java
@@ -72,15 +72,6 @@ public class DdbComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public DdbConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -131,14 +122,6 @@ public class DdbComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class DdbConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.ddb.DdbConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentConfiguration.java b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentConfiguration.java
index 9e99a8c..49f5f82 100644
--- a/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentConfiguration.java
+++ b/components-starter/camel-aws-ddb-starter/src/main/java/org/apache/camel/component/aws/ddbstream/springboot/DdbStreamComponentConfiguration.java
@@ -62,17 +62,6 @@ public class DdbStreamComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -123,14 +112,6 @@ public class DdbStreamComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConfiguration.java b/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConfiguration.java
index 18ee458..81dc19b 100644
--- a/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConfiguration.java
+++ b/components-starter/camel-aws-ec2-starter/src/main/java/org/apache/camel/component/aws/ec2/springboot/EC2ComponentConfiguration.java
@@ -71,15 +71,6 @@ public class EC2ComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public EC2ConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class EC2ComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class EC2ConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.ec2.EC2Configuration.class;
         /**
diff --git a/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentConfiguration.java b/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentConfiguration.java
index 162da7d..622efd5 100644
--- a/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentConfiguration.java
+++ b/components-starter/camel-aws-ecs-starter/src/main/java/org/apache/camel/component/aws/ecs/springboot/ECSComponentConfiguration.java
@@ -71,15 +71,6 @@ public class ECSComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public ECSConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class ECSComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class ECSConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.ecs.ECSConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentConfiguration.java b/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentConfiguration.java
index 265c028..758380b 100644
--- a/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentConfiguration.java
+++ b/components-starter/camel-aws-eks-starter/src/main/java/org/apache/camel/component/aws/eks/springboot/EKSComponentConfiguration.java
@@ -71,15 +71,6 @@ public class EKSComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public EKSConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class EKSComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class EKSConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.eks.EKSConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java b/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java
index 1841e90..6784935 100644
--- a/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java
+++ b/components-starter/camel-aws-iam-starter/src/main/java/org/apache/camel/component/aws/iam/springboot/IAMComponentConfiguration.java
@@ -71,15 +71,6 @@ public class IAMComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public IAMConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class IAMComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class IAMConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.iam.IAMConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentConfiguration.java b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentConfiguration.java
index 6091c80..be49530 100644
--- a/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentConfiguration.java
+++ b/components-starter/camel-aws-kinesis-starter/src/main/java/org/apache/camel/component/aws/firehose/springboot/KinesisFirehoseComponentConfiguration.java
@@ -71,15 +71,6 @@ public class KinesisFirehoseComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public KinesisFirehoseConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class KinesisFirehoseComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class KinesisFirehoseConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentConfiguration.java b/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentConfiguration.java
index 33096af..06cf93e 100644
--- a/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentConfiguration.java
+++ b/components-starter/camel-aws-kms-starter/src/main/java/org/apache/camel/component/aws/kms/springboot/KMSComponentConfiguration.java
@@ -71,15 +71,6 @@ public class KMSComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public KMSConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class KMSComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class KMSConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.kms.KMSConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConfiguration.java b/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConfiguration.java
index fa4075a..1e720ac 100644
--- a/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConfiguration.java
+++ b/components-starter/camel-aws-lambda-starter/src/main/java/org/apache/camel/component/aws/lambda/springboot/LambdaComponentConfiguration.java
@@ -72,15 +72,6 @@ public class LambdaComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public LambdaConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -131,14 +122,6 @@ public class LambdaComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class LambdaConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.lambda.LambdaConfiguration.class;
         /**
@@ -150,14 +133,10 @@ public class LambdaComponentConfiguration
          */
         private AWSLambda awsLambdaClient;
         /**
-         * Name of the Lambda function.
-         */
-        private String function;
-        /**
          * The operation to perform. It can be listFunctions, getFunction,
          * createFunction, deleteFunction or invokeFunction
          */
-        private LambdaOperations operation;
+        private LambdaOperations operation = LambdaOperations.invokeFunction;
         /**
          * To define a proxy host when instantiating the Lambda client
          */
@@ -197,14 +176,6 @@ public class LambdaComponentConfiguration
             this.awsLambdaClient = awsLambdaClient;
         }
 
-        public String getFunction() {
-            return function;
-        }
-
-        public void setFunction(String function) {
-            this.function = function;
-        }
-
         public LambdaOperations getOperation() {
             return operation;
         }
diff --git a/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentConfiguration.java b/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentConfiguration.java
index 47f89c9..3603626 100644
--- a/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentConfiguration.java
+++ b/components-starter/camel-aws-mq-starter/src/main/java/org/apache/camel/component/aws/mq/springboot/MQComponentConfiguration.java
@@ -71,15 +71,6 @@ public class MQComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public MQConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class MQComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class MQConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.mq.MQConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentConfiguration.java b/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentConfiguration.java
index 7662853..fc514d8 100644
--- a/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentConfiguration.java
+++ b/components-starter/camel-aws-msk-starter/src/main/java/org/apache/camel/component/aws/msk/springboot/MSKComponentConfiguration.java
@@ -71,15 +71,6 @@ public class MSKComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public MSKConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class MSKComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class MSKConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.msk.MSKConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-sdb-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentConfiguration.java b/components-starter/camel-aws-sdb-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentConfiguration.java
index 21618c2..c5d923a 100644
--- a/components-starter/camel-aws-sdb-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentConfiguration.java
+++ b/components-starter/camel-aws-sdb-starter/src/main/java/org/apache/camel/component/aws/sdb/springboot/SdbComponentConfiguration.java
@@ -53,15 +53,6 @@ public class SdbComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class SdbComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConfiguration.java b/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConfiguration.java
index 10ace41..c52a2ea 100644
--- a/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConfiguration.java
+++ b/components-starter/camel-aws-ses-starter/src/main/java/org/apache/camel/component/aws/ses/springboot/SesComponentConfiguration.java
@@ -71,15 +71,6 @@ public class SesComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public SesConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class SesComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class SesConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.ses.SesConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java b/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
index 41c4373..4fe9cec 100644
--- a/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
+++ b/components-starter/camel-aws-sns-starter/src/main/java/org/apache/camel/component/aws/sns/springboot/SnsComponentConfiguration.java
@@ -72,15 +72,6 @@ public class SnsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public SnsConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -131,14 +122,6 @@ public class SnsComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class SnsConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.sns.SnsConfiguration.class;
         /**
diff --git a/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentConfiguration.java b/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentConfiguration.java
index 51f2513..7d0952c 100644
--- a/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentConfiguration.java
+++ b/components-starter/camel-aws-translate-starter/src/main/java/org/apache/camel/component/aws/translate/springboot/TranslateComponentConfiguration.java
@@ -24,7 +24,7 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * The aws-kms is used for managing Amazon Translate
+ * The aws-translate component is used for managing Amazon Translate
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -71,15 +71,6 @@ public class TranslateComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public TranslateConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -130,14 +121,6 @@ public class TranslateComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class TranslateConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.aws.translate.TranslateConfiguration.class;
         /**
@@ -176,6 +159,14 @@ public class TranslateComponentConfiguration
          */
         private String secretKey;
         /**
+         * Source language to use
+         */
+        private String sourceLanguage;
+        /**
+         * Target language to use
+         */
+        private String targetLanguage;
+        /**
          * To use a existing configured AWS Translate as client
          */
         private AmazonTranslate translateClient;
@@ -244,6 +235,22 @@ public class TranslateComponentConfiguration
             this.secretKey = secretKey;
         }
 
+        public String getSourceLanguage() {
+            return sourceLanguage;
+        }
+
+        public void setSourceLanguage(String sourceLanguage) {
+            this.sourceLanguage = sourceLanguage;
+        }
+
+        public String getTargetLanguage() {
+            return targetLanguage;
+        }
+
+        public void setTargetLanguage(String targetLanguage) {
+            this.targetLanguage = targetLanguage;
+        }
+
         public AmazonTranslate getTranslateClient() {
             return translateClient;
         }
diff --git a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentConfiguration.java b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentConfiguration.java
index 9d87f6b..13ab690 100644
--- a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentConfiguration.java
+++ b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/bean/springboot/BeanComponentConfiguration.java
@@ -17,8 +17,11 @@
 package org.apache.camel.component.bean.springboot;
 
 import javax.annotation.Generated;
+import org.apache.camel.BeanScope;
+import org.apache.camel.component.bean.BeanComponent;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 
 /**
  * The bean component is for invoking Java beans from Camel.
@@ -37,11 +40,26 @@ public class BeanComponentConfiguration
      */
     private Boolean enabled;
     /**
-     * If enabled, Camel will cache the result of the first Registry look-up.
-     * Cache can be enabled if the bean in the Registry is defined as a
-     * singleton scope.
+     * Use singleton option instead.
      */
-    private Boolean cache;
+    @Deprecated
+    private Boolean cache = true;
+    /**
+     * Scope of bean. When using singleton scope (default) the bean is created
+     * or looked up only once and reused for the lifetime of the endpoint. The
+     * bean should be thread-safe in case concurrent threads is calling the bean
+     * at the same time. When using request scope the bean is created or looked
+     * up once per request (exchange). This can be used if you want to store
+     * state on a bean while processing a request and you want to call the same
+     * bean instance multiple times while processing the request. The bean does
+     * not have to be thread-safe as the instance is only called from the same
+     * request. When using delegate scope, then the bean will be looked up or
+     * created per call. However in case of lookup then this is delegated to the
+     * bean registry such as Spring or CDI (if in use), which depends on their
+     * configuration can act as either singleton or prototype scope. so when
+     * using prototype then this depends on the delegated registry.
+     */
+    private BeanScope scope = BeanScope.Singleton;
     /**
      * Whether the component should use basic property binding (Camel 2.x) or
      * the newer property binding with additional capabilities
@@ -58,24 +76,26 @@ public class BeanComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
+    @Deprecated
+    @DeprecatedConfigurationProperty
     public Boolean getCache() {
         return cache;
     }
 
+    @Deprecated
     public void setCache(Boolean cache) {
         this.cache = cache;
     }
 
+    public BeanScope getScope() {
+        return scope;
+    }
+
+    public void setScope(BeanScope scope) {
+        this.scope = scope;
+    }
+
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
     }
@@ -91,12 +111,4 @@ public class BeanComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentConfiguration.java b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentConfiguration.java
index f115e5b..23db463 100644
--- a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentConfiguration.java
+++ b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/component/beanclass/springboot/ClassComponentConfiguration.java
@@ -17,11 +17,14 @@
 package org.apache.camel.component.beanclass.springboot;
 
 import javax.annotation.Generated;
+import org.apache.camel.BeanScope;
+import org.apache.camel.component.beanclass.ClassComponent;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 
 /**
- * The class component is for invoking Java classes (Java beans) from Camel.
+ * The Class component is for invoking Java classes (Java beans) from Camel.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -37,11 +40,26 @@ public class ClassComponentConfiguration
      */
     private Boolean enabled;
     /**
-     * If enabled, Camel will cache the result of the first Registry look-up.
-     * Cache can be enabled if the bean in the Registry is defined as a
-     * singleton scope.
+     * Use singleton option instead.
      */
-    private Boolean cache;
+    @Deprecated
+    private Boolean cache = true;
+    /**
+     * Scope of bean. When using singleton scope (default) the bean is created
+     * or looked up only once and reused for the lifetime of the endpoint. The
+     * bean should be thread-safe in case concurrent threads is calling the bean
+     * at the same time. When using request scope the bean is created or looked
+     * up once per request (exchange). This can be used if you want to store
+     * state on a bean while processing a request and you want to call the same
+     * bean instance multiple times while processing the request. The bean does
+     * not have to be thread-safe as the instance is only called from the same
+     * request. When using delegate scope, then the bean will be looked up or
+     * created per call. However in case of lookup then this is delegated to the
+     * bean registry such as Spring or CDI (if in use), which depends on their
+     * configuration can act as either singleton or prototype scope. so when
+     * using prototype then this depends on the delegated registry.
+     */
+    private BeanScope scope = BeanScope.Singleton;
     /**
      * Whether the component should use basic property binding (Camel 2.x) or
      * the newer property binding with additional capabilities
@@ -58,24 +76,26 @@ public class ClassComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
+    @Deprecated
+    @DeprecatedConfigurationProperty
     public Boolean getCache() {
         return cache;
     }
 
+    @Deprecated
     public void setCache(Boolean cache) {
         this.cache = cache;
     }
 
+    public BeanScope getScope() {
+        return scope;
+    }
+
+    public void setScope(BeanScope scope) {
+        this.scope = scope;
+    }
+
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
     }
@@ -91,12 +111,4 @@ public class ClassComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConfiguration.java b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConfiguration.java
index 3fd81f5..058886b 100644
--- a/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConfiguration.java
+++ b/components-starter/camel-bean-validator-starter/src/main/java/org/apache/camel/component/bean/validator/springboot/BeanValidatorComponentConfiguration.java
@@ -77,15 +77,6 @@ public class BeanValidatorComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getIgnoreXmlConfiguration() {
         return ignoreXmlConfiguration;
@@ -142,12 +133,4 @@ public class BeanValidatorComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentConfiguration.java b/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentConfiguration.java
index e903dae..ef570fc 100644
--- a/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentConfiguration.java
+++ b/components-starter/camel-bonita-starter/src/main/java/org/apache/camel/component/bonita/springboot/BonitaComponentConfiguration.java
@@ -52,15 +52,6 @@ public class BonitaComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class BonitaComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConfiguration.java b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConfiguration.java
index 8258115..ecd92b4 100644
--- a/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConfiguration.java
+++ b/components-starter/camel-braintree-starter/src/main/java/org/apache/camel/component/braintree/springboot/BraintreeComponentConfiguration.java
@@ -44,6 +44,12 @@ public class BraintreeComponentConfiguration
      */
     private BraintreeConfigurationNestedConfiguration configuration;
     /**
+     * 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.
+     */
+    private Boolean logHandlerEnabled = true;
+    /**
      * Whether the component should use basic property binding (Camel 2.x) or
      * the newer property binding with additional capabilities
      */
@@ -78,6 +84,14 @@ public class BraintreeComponentConfiguration
         this.configuration = configuration;
     }
 
+    public Boolean getLogHandlerEnabled() {
+        return logHandlerEnabled;
+    }
+
+    public void setLogHandlerEnabled(Boolean logHandlerEnabled) {
+        this.logHandlerEnabled = logHandlerEnabled;
+    }
+
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
     }
@@ -128,6 +142,13 @@ public class BraintreeComponentConfiguration
          */
         private Integer httpReadTimeout;
         /**
+         * 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.
+         */
+        private Boolean logHandlerEnabled = true;
+        /**
          * The merchant id provided by Braintree.
          */
         private String merchantId;
@@ -200,6 +221,14 @@ public class BraintreeComponentConfiguration
             this.httpReadTimeout = httpReadTimeout;
         }
 
+        public Boolean getLogHandlerEnabled() {
+            return logHandlerEnabled;
+        }
+
+        public void setLogHandlerEnabled(Boolean logHandlerEnabled) {
+            this.logHandlerEnabled = logHandlerEnabled;
+        }
+
         public String getMerchantId() {
             return merchantId;
         }
diff --git a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
index 9287d9b..8bceedf 100644
--- a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
+++ b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
@@ -61,15 +61,6 @@ public class CaffeineCacheComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public CaffeineConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -96,14 +87,6 @@ public class CaffeineCacheComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class CaffeineConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.caffeine.CaffeineConfiguration.class;
         /**
diff --git a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
index 079746d..a91743d 100644
--- a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
+++ b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
@@ -62,15 +62,6 @@ public class CaffeineLoadCacheComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public CaffeineConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -97,14 +88,6 @@ public class CaffeineLoadCacheComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class CaffeineConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.caffeine.CaffeineConfiguration.class;
         /**
diff --git a/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentConfiguration.java b/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentConfiguration.java
index 99c7da4..0a23be6 100644
--- a/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentConfiguration.java
+++ b/components-starter/camel-cassandraql-starter/src/main/java/org/apache/camel/component/cassandra/springboot/CassandraComponentConfiguration.java
@@ -22,7 +22,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
  * The cql component aims at integrating Cassandra 2.0 using the CQL3 API (not
- * the Thrift API).
+ * the Thrift API). It's based on Cassandra Java Driver provided by DataStax.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
diff --git a/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentConfiguration.java b/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentConfiguration.java
index 2305a40..36737df 100644
--- a/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentConfiguration.java
+++ b/components-starter/camel-chatscript-starter/src/main/java/org/apache/camel/component/chatscript/springboot/ChatScriptComponentConfiguration.java
@@ -52,15 +52,6 @@ public class ChatScriptComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class ChatScriptComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentConfiguration.java b/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentConfiguration.java
index 038e377..aa17519 100644
--- a/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentConfiguration.java
+++ b/components-starter/camel-chunk-starter/src/main/java/org/apache/camel/component/chunk/springboot/ChunkComponentConfiguration.java
@@ -52,15 +52,6 @@ public class ChunkComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class ChunkComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentConfiguration.java b/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentConfiguration.java
index d2876d4..fe9a10a 100644
--- a/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentConfiguration.java
+++ b/components-starter/camel-cm-sms-starter/src/main/java/org/apache/camel/component/cm/springboot/CMComponentConfiguration.java
@@ -52,15 +52,6 @@ public class CMComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class CMComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
index 7b2d4bb..2006295 100644
--- a/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
+++ b/components-starter/camel-consul-starter/src/main/java/org/apache/camel/component/consul/springboot/ConsulComponentConfiguration.java
@@ -197,38 +197,82 @@ public class ConsulComponentConfiguration
 
     public static class ConsulConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.consul.ConsulConfiguration.class;
+        /**
+         * The default action. Can be overridden by CamelConsulAction
+         */
         private String action;
+        /**
+         * Reference to a com.orbitz.consul.Consul in the registry.
+         */
         private Consul consulClient;
+        /**
+         * The default key. Can be overridden by CamelConsulKey
+         */
         private String key;
-        private Boolean valueAsString;
+        /**
+         * Default to transform values retrieved from Consul i.e. on KV endpoint
+         * to string.
+         */
+        private Boolean valueAsString = false;
         /**
          * Sets the ACL token to be used with Consul
          */
         private String aclToken;
-        private Integer blockSeconds;
+        /**
+         * The second to wait for a watch event, default 10 seconds
+         */
+        private Integer blockSeconds = 10;
+        /**
+         * Connect timeout for OkHttpClient
+         */
         private Long connectTimeoutMillis;
-        private ConsistencyMode consistencyMode;
+        /**
+         * The consistencyMode used for queries, default ConsistencyMode.DEFAULT
+         */
+        private ConsistencyMode consistencyMode = ConsistencyMode.DEFAULT;
         /**
          * The data center
          */
         private String datacenter;
         @Deprecated
         private String dc;
+        /**
+         * The first index for watch for, default 0
+         */
         private BigInteger firstIndex;
+        /**
+         * The near node to use for queries.
+         */
         private String nearNode;
+        /**
+         * The note meta-data to use for queries.
+         */
         private List nodeMeta;
         /**
          * Sets the password to be used for basic authentication
          */
         private String password;
-        private Boolean pingInstance;
+        /**
+         * Configure if the AgentClient should attempt a ping before returning
+         * the Consul instance
+         */
+        private Boolean pingInstance = true;
+        /**
+         * Read timeout for OkHttpClient
+         */
         private Long readTimeoutMillis;
-        private Boolean recursive;
+        /**
+         * Recursively watch, default false
+         */
+        private Boolean recursive = false;
         /**
          * SSL configuration using an
          * org.apache.camel.support.jsse.SSLContextParameters instance.
          */
         private SSLContextParameters sslContextParameters;
+        /**
+         * Set tags. You can separate multiple tags by comma.
+         */
         private Set tags;
         /**
          * The Consul agent URL
@@ -238,6 +282,9 @@ public class ConsulComponentConfiguration
          * Sets the username to be used for basic authentication
          */
         private String userName;
+        /**
+         * Write timeout for OkHttpClient
+         */
         private Long writeTimeoutMillis;
 
         public String getAction() {
diff --git a/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentConfiguration.java b/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentConfiguration.java
index 0a85be9..9c648bb 100644
--- a/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentConfiguration.java
+++ b/components-starter/camel-controlbus-starter/src/main/java/org/apache/camel/component/controlbus/springboot/ControlBusComponentConfiguration.java
@@ -53,15 +53,6 @@ public class ControlBusComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class ControlBusComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml
index fccd36e..67d5871 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,18 +38,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-corda</artifactId>
       <version>${camel-version}</version>
-      <!--START OF GENERATED CODE-->
-      <exclusions>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-classic</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>ch.qos.logback</groupId>
-          <artifactId>logback-core</artifactId>
-        </exclusion>
-      </exclusions>
-      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConfiguration.java b/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConfiguration.java
index 3aa20ad..8a433a0 100644
--- a/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConfiguration.java
+++ b/components-starter/camel-corda-starter/src/main/java/org/apache/camel/component/corda/springboot/CordaComponentConfiguration.java
@@ -24,7 +24,7 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * The corda component uses the corda-rpc to interact with corda nodes.
+ * The corda component uses corda-rpc to interact with corda nodes.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
@@ -40,7 +40,7 @@ public class CordaComponentConfiguration
      */
     private Boolean enabled;
     /**
-     * Default configuration
+     * To use a shared configuration.
      */
     private CordaConfigurationNestedConfiguration configuration;
     /**
@@ -108,13 +108,26 @@ public class CordaComponentConfiguration
         private Class contractStateClass;
         private Class flowLociClass;
         private String host;
+        /**
+         * The url for the corda node
+         */
+        private String node;
+        /**
+         * Operation to use
+         */
         private String operation;
         private PageSpecification pageSpecification;
+        /**
+         * Password for login
+         */
         private String password;
         private Integer port;
         private Boolean processSnapshot;
         private QueryCriteria queryCriteria;
         private Sort sort;
+        /**
+         * Username for login
+         */
         private String username;
 
         public Object[] getArguments() {
@@ -149,6 +162,14 @@ public class CordaComponentConfiguration
             this.host = host;
         }
 
+        public String getNode() {
+            return node;
+        }
+
+        public void setNode(String node) {
+            this.node = node;
+        }
+
         public String getOperation() {
             return operation;
         }
diff --git a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/springboot/HystrixConfigurationDefinitionCommon.java b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/springboot/HystrixConfigurationDefinitionCommon.java
index 32f1e7b..90f3324 100644
--- a/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/springboot/HystrixConfigurationDefinitionCommon.java
+++ b/components-starter/camel-core-starter/src/main/java/org/apache/camel/model/springboot/HystrixConfigurationDefinitionCommon.java
@@ -42,7 +42,7 @@ public class HystrixConfigurationDefinitionCommon {
      * tracking metrics and knowing whether it should be open/closed, this
      * property results in not even instantiating a circuit-breaker.
      */
-    private Boolean circuitBreakerEnabled = true;
+    private String circuitBreakerEnabled = "true";
     /**
      * Error percentage threshold (as whole number such as 50) at which point
      * the circuit breaker will trip open and reject requests. It will stay
@@ -50,7 +50,7 @@ public class HystrixConfigurationDefinitionCommon {
      * circuitBreakerSleepWindowInMilliseconds; The error percentage this is
      * compared against comes from HystrixCommandMetrics.getHealthCounts().
      */
-    private Integer circuitBreakerErrorThresholdPercentage = 50;
+    private String circuitBreakerErrorThresholdPercentage = "50";
     /**
      * If true the HystrixCircuitBreaker#allowRequest() will always return true
      * to allow requests regardless of the error percentage from
@@ -58,31 +58,31 @@ public class HystrixConfigurationDefinitionCommon {
      * property takes precedence so if it set to true this property does
      * nothing.
      */
-    private Boolean circuitBreakerForceClosed = false;
+    private String circuitBreakerForceClosed = "false";
     /**
      * If true the HystrixCircuitBreaker.allowRequest() will always return
      * false, causing the circuit to be open (tripped) and reject all requests.
      * This property takes precedence over circuitBreakerForceClosed();
      */
-    private Boolean circuitBreakerForceOpen = false;
+    private String circuitBreakerForceOpen = "false";
     /**
      * Minimum number of requests in the
      * metricsRollingStatisticalWindowInMilliseconds() that must exist before
      * the HystrixCircuitBreaker will trip. If below this number the circuit
      * will not trip regardless of error percentage.
      */
-    private Integer circuitBreakerRequestVolumeThreshold = 20;
+    private String circuitBreakerRequestVolumeThreshold = "20";
     /**
      * The time in milliseconds after a HystrixCircuitBreaker trips open that it
      * should wait before trying requests again.
      */
-    private Integer circuitBreakerSleepWindowInMilliseconds = 5000;
+    private String circuitBreakerSleepWindowInMilliseconds = "5000";
     /**
      * Number of concurrent requests permitted to HystrixCommand.run(). Requests
      * beyond the concurrent limit will be rejected. Applicable only when
      * executionIsolationStrategy == SEMAPHORE.
      */
-    private Integer executionIsolationSemaphoreMaxConcurrentRequests = 20;
+    private String executionIsolationSemaphoreMaxConcurrentRequests = "20";
     /**
      * What isolation strategy HystrixCommand.run() will be executed with. If
      * THREAD then it will be executed on a separate thread and concurrent
@@ -96,7 +96,7 @@ public class HystrixConfigurationDefinitionCommon {
      * Future#cancel) when a thread times out. Applicable only when
      * executionIsolationStrategy() == THREAD.
      */
-    private Boolean executionIsolationThreadInterruptOnTimeout = true;
+    private String executionIsolationThreadInterruptOnTimeout = "true";
     /**
      * Time in milliseconds at which point the command will timeout and halt
      * execution. If executionIsolationThreadInterruptOnTimeout == true and the
@@ -104,22 +104,22 @@ public class HystrixConfigurationDefinitionCommon {
      * the command is semaphore-isolated and a HystrixObservableCommand, that
      * command will get unsubscribed.
      */
-    private Integer executionTimeoutInMilliseconds = 1000;
+    private String executionTimeoutInMilliseconds = "1000";
     /**
      * Whether the timeout mechanism is enabled for this command
      */
-    private Boolean executionTimeoutEnabled = true;
+    private String executionTimeoutEnabled = "true";
     /**
      * Number of concurrent requests permitted to HystrixCommand.getFallback().
      * Requests beyond the concurrent limit will fail-fast and not attempt
      * retrieving a fallback.
      */
-    private Integer fallbackIsolationSemaphoreMaxConcurrentRequests = 10;
+    private String fallbackIsolationSemaphoreMaxConcurrentRequests = "10";
     /**
      * Whether HystrixCommand.getFallback() should be attempted when failure
      * occurs.
      */
-    private Boolean fallbackEnabled = true;
+    private String fallbackEnabled = "true";
     /**
      * Time in milliseconds to wait between allowing health snapshots to be
      * taken that calculate success and error percentages and affect
@@ -127,49 +127,49 @@ public class HystrixConfigurationDefinitionCommon {
      * continual calculation of error percentage can become CPU intensive thus
      * this controls how often it is calculated.
      */
-    private Integer metricsHealthSnapshotIntervalInMilliseconds = 500;
+    private String metricsHealthSnapshotIntervalInMilliseconds = "500";
     /**
      * Maximum number of values stored in each bucket of the rolling percentile.
      * This is passed into HystrixRollingPercentile inside
      * HystrixCommandMetrics.
      */
-    private Integer metricsRollingPercentileBucketSize = 10;
+    private String metricsRollingPercentileBucketSize = "10";
     /**
      * Whether percentile metrics should be captured using
      * HystrixRollingPercentile inside HystrixCommandMetrics.
      */
-    private Boolean metricsRollingPercentileEnabled = true;
+    private String metricsRollingPercentileEnabled = "true";
     /**
      * Duration of percentile rolling window in milliseconds. This is passed
      * into HystrixRollingPercentile inside HystrixCommandMetrics.
      */
-    private Integer metricsRollingPercentileWindowInMilliseconds = 10000;
+    private String metricsRollingPercentileWindowInMilliseconds = "10000";
     /**
      * Number of buckets the rolling percentile window is broken into. This is
      * passed into HystrixRollingPercentile inside HystrixCommandMetrics.
      */
-    private Integer metricsRollingPercentileWindowBuckets = 6;
+    private String metricsRollingPercentileWindowBuckets = "6";
     /**
      * This property sets the duration of the statistical rolling window, in
      * milliseconds. This is how long metrics are kept for the thread pool. The
      * window is divided into buckets and rolls by those increments.
      */
-    private Integer metricsRollingStatisticalWindowInMilliseconds = 10000;
+    private String metricsRollingStatisticalWindowInMilliseconds = "10000";
     /**
      * Number of buckets the rolling statistical window is broken into. This is
      * passed into HystrixRollingNumber inside HystrixCommandMetrics.
      */
-    private Integer metricsRollingStatisticalWindowBuckets = 10;
+    private String metricsRollingStatisticalWindowBuckets = "10";
     /**
      * Whether HystrixCommand execution and events should be logged to
      * HystrixRequestLog.
      */
-    private Boolean requestLogEnabled = true;
+    private String requestLogEnabled = "true";
     /**
      * Core thread-pool size that gets passed to
      * java.util.concurrent.ThreadPoolExecutor#setCorePoolSize(int)
      */
-    private Integer corePoolSize = 10;
+    private String corePoolSize = "10";
     /**
      * Maximum thread-pool size that gets passed to
      * ThreadPoolExecutor#setMaximumPoolSize(int). This is the maximum amount of
@@ -177,19 +177,19 @@ public class HystrixConfigurationDefinitionCommon {
      * HystrixCommands. Please note that this setting only takes effect if you
      * also set allowMaximumSizeToDivergeFromCoreSize
      */
-    private Integer maximumSize = 10;
+    private String maximumSize = "10";
     /**
      * Keep-alive time in minutes that gets passed to {link
      * ThreadPoolExecutor#setKeepAliveTime(long, TimeUnit)}
      */
-    private Integer keepAliveTime = 1;
+    private String keepAliveTime = "1";
     /**
      * Max queue size that gets passed to BlockingQueue in
      * HystrixConcurrencyStrategy.getBlockingQueue(int) This should only affect
      * the instantiation of a threadpool - it is not eliglible to change a queue
      * size on the fly. For that, use queueSizeRejectionThreshold().
      */
-    private Integer maxQueueSize = -1;
+    private String maxQueueSize = "-1";
     /**
      * Queue size rejection threshold is an artificial max size at which
      * rejections will occur even if maxQueueSize has not been reached. This is
@@ -198,23 +198,23 @@ public class HystrixConfigurationDefinitionCommon {
      * affects rejections. This is used by HystrixCommand when queuing a thread
      * for execution.
      */
-    private Integer queueSizeRejectionThreshold = 5;
+    private String queueSizeRejectionThreshold = "5";
     /**
      * Duration of statistical rolling window in milliseconds. This is passed
      * into HystrixRollingNumber inside each HystrixThreadPoolMetrics instance.
      */
-    private Integer threadPoolRollingNumberStatisticalWindowInMilliseconds = 10000;
+    private String threadPoolRollingNumberStatisticalWindowInMilliseconds = "10000";
     /**
      * Number of buckets the rolling statistical window is broken into. This is
      * passed into HystrixRollingNumber inside each HystrixThreadPoolMetrics
      * instance.
      */
-    private Integer threadPoolRollingNumberStatisticalWindowBuckets = 10;
+    private String threadPoolRollingNumberStatisticalWindowBuckets = "10";
     /**
      * Allows the configuration for maximumSize to take effect. That value can
      * then be equal to, or higher, than coreSize
      */
-    private Boolean allowMaximumSizeToDivergeFromCoreSize = false;
+    private String allowMaximumSizeToDivergeFromCoreSize = "false";
 
     public String getGroupKey() {
         return groupKey;
@@ -232,63 +232,63 @@ public class HystrixConfigurationDefinitionCommon {
         this.threadPoolKey = threadPoolKey;
     }
 
-    public Boolean getCircuitBreakerEnabled() {
+    public String getCircuitBreakerEnabled() {
         return circuitBreakerEnabled;
     }
 
-    public void setCircuitBreakerEnabled(Boolean circuitBreakerEnabled) {
+    public void setCircuitBreakerEnabled(String circuitBreakerEnabled) {
         this.circuitBreakerEnabled = circuitBreakerEnabled;
     }
 
-    public Integer getCircuitBreakerErrorThresholdPercentage() {
+    public String getCircuitBreakerErrorThresholdPercentage() {
         return circuitBreakerErrorThresholdPercentage;
     }
 
     public void setCircuitBreakerErrorThresholdPercentage(
-            Integer circuitBreakerErrorThresholdPercentage) {
+            String circuitBreakerErrorThresholdPercentage) {
         this.circuitBreakerErrorThresholdPercentage = circuitBreakerErrorThresholdPercentage;
     }
 
-    public Boolean getCircuitBreakerForceClosed() {
+    public String getCircuitBreakerForceClosed() {
         return circuitBreakerForceClosed;
     }
 
-    public void setCircuitBreakerForceClosed(Boolean circuitBreakerForceClosed) {
+    public void setCircuitBreakerForceClosed(String circuitBreakerForceClosed) {
         this.circuitBreakerForceClosed = circuitBreakerForceClosed;
     }
 
-    public Boolean getCircuitBreakerForceOpen() {
+    public String getCircuitBreakerForceOpen() {
         return circuitBreakerForceOpen;
     }
 
-    public void setCircuitBreakerForceOpen(Boolean circuitBreakerForceOpen) {
+    public void setCircuitBreakerForceOpen(String circuitBreakerForceOpen) {
         this.circuitBreakerForceOpen = circuitBreakerForceOpen;
     }
 
-    public Integer getCircuitBreakerRequestVolumeThreshold() {
+    public String getCircuitBreakerRequestVolumeThreshold() {
         return circuitBreakerRequestVolumeThreshold;
     }
 
     public void setCircuitBreakerRequestVolumeThreshold(
-            Integer circuitBreakerRequestVolumeThreshold) {
+            String circuitBreakerRequestVolumeThreshold) {
         this.circuitBreakerRequestVolumeThreshold = circuitBreakerRequestVolumeThreshold;
     }
 
-    public Integer getCircuitBreakerSleepWindowInMilliseconds() {
+    public String getCircuitBreakerSleepWindowInMilliseconds() {
         return circuitBreakerSleepWindowInMilliseconds;
     }
 
     public void setCircuitBreakerSleepWindowInMilliseconds(
-            Integer circuitBreakerSleepWindowInMilliseconds) {
+            String circuitBreakerSleepWindowInMilliseconds) {
         this.circuitBreakerSleepWindowInMilliseconds = circuitBreakerSleepWindowInMilliseconds;
     }
 
-    public Integer getExecutionIsolationSemaphoreMaxConcurrentRequests() {
+    public String getExecutionIsolationSemaphoreMaxConcurrentRequests() {
         return executionIsolationSemaphoreMaxConcurrentRequests;
     }
 
     public void setExecutionIsolationSemaphoreMaxConcurrentRequests(
-            Integer executionIsolationSemaphoreMaxConcurrentRequests) {
+            String executionIsolationSemaphoreMaxConcurrentRequests) {
         this.executionIsolationSemaphoreMaxConcurrentRequests = executionIsolationSemaphoreMaxConcurrentRequests;
     }
 
@@ -300,185 +300,185 @@ public class HystrixConfigurationDefinitionCommon {
         this.executionIsolationStrategy = executionIsolationStrategy;
     }
 
-    public Boolean getExecutionIsolationThreadInterruptOnTimeout() {
+    public String getExecutionIsolationThreadInterruptOnTimeout() {
         return executionIsolationThreadInterruptOnTimeout;
     }
 
     public void setExecutionIsolationThreadInterruptOnTimeout(
-            Boolean executionIsolationThreadInterruptOnTimeout) {
+            String executionIsolationThreadInterruptOnTimeout) {
         this.executionIsolationThreadInterruptOnTimeout = executionIsolationThreadInterruptOnTimeout;
     }
 
-    public Integer getExecutionTimeoutInMilliseconds() {
+    public String getExecutionTimeoutInMilliseconds() {
         return executionTimeoutInMilliseconds;
     }
 
     public void setExecutionTimeoutInMilliseconds(
-            Integer executionTimeoutInMilliseconds) {
+            String executionTimeoutInMilliseconds) {
         this.executionTimeoutInMilliseconds = executionTimeoutInMilliseconds;
     }
 
-    public Boolean getExecutionTimeoutEnabled() {
+    public String getExecutionTimeoutEnabled() {
         return executionTimeoutEnabled;
     }
 
-    public void setExecutionTimeoutEnabled(Boolean executionTimeoutEnabled) {
+    public void setExecutionTimeoutEnabled(String executionTimeoutEnabled) {
         this.executionTimeoutEnabled = executionTimeoutEnabled;
     }
 
-    public Integer getFallbackIsolationSemaphoreMaxConcurrentRequests() {
+    public String getFallbackIsolationSemaphoreMaxConcurrentRequests() {
         return fallbackIsolationSemaphoreMaxConcurrentRequests;
     }
 
     public void setFallbackIsolationSemaphoreMaxConcurrentRequests(
-            Integer fallbackIsolationSemaphoreMaxConcurrentRequests) {
+            String fallbackIsolationSemaphoreMaxConcurrentRequests) {
         this.fallbackIsolationSemaphoreMaxConcurrentRequests = fallbackIsolationSemaphoreMaxConcurrentRequests;
     }
 
-    public Boolean getFallbackEnabled() {
+    public String getFallbackEnabled() {
         return fallbackEnabled;
     }
 
-    public void setFallbackEnabled(Boolean fallbackEnabled) {
+    public void setFallbackEnabled(String fallbackEnabled) {
         this.fallbackEnabled = fallbackEnabled;
     }
 
-    public Integer getMetricsHealthSnapshotIntervalInMilliseconds() {
+    public String getMetricsHealthSnapshotIntervalInMilliseconds() {
         return metricsHealthSnapshotIntervalInMilliseconds;
     }
 
     public void setMetricsHealthSnapshotIntervalInMilliseconds(
-            Integer metricsHealthSnapshotIntervalInMilliseconds) {
+            String metricsHealthSnapshotIntervalInMilliseconds) {
         this.metricsHealthSnapshotIntervalInMilliseconds = metricsHealthSnapshotIntervalInMilliseconds;
     }
 
-    public Integer getMetricsRollingPercentileBucketSize() {
+    public String getMetricsRollingPercentileBucketSize() {
         return metricsRollingPercentileBucketSize;
     }
 
     public void setMetricsRollingPercentileBucketSize(
-            Integer metricsRollingPercentileBucketSize) {
+            String metricsRollingPercentileBucketSize) {
         this.metricsRollingPercentileBucketSize = metricsRollingPercentileBucketSize;
     }
 
-    public Boolean getMetricsRollingPercentileEnabled() {
+    public String getMetricsRollingPercentileEnabled() {
         return metricsRollingPercentileEnabled;
     }
 
     public void setMetricsRollingPercentileEnabled(
-            Boolean metricsRollingPercentileEnabled) {
+            String metricsRollingPercentileEnabled) {
         this.metricsRollingPercentileEnabled = metricsRollingPercentileEnabled;
     }
 
-    public Integer getMetricsRollingPercentileWindowInMilliseconds() {
+    public String getMetricsRollingPercentileWindowInMilliseconds() {
         return metricsRollingPercentileWindowInMilliseconds;
     }
 
     public void setMetricsRollingPercentileWindowInMilliseconds(
-            Integer metricsRollingPercentileWindowInMilliseconds) {
+            String metricsRollingPercentileWindowInMilliseconds) {
         this.metricsRollingPercentileWindowInMilliseconds = metricsRollingPercentileWindowInMilliseconds;
     }
 
-    public Integer getMetricsRollingPercentileWindowBuckets() {
+    public String getMetricsRollingPercentileWindowBuckets() {
         return metricsRollingPercentileWindowBuckets;
     }
 
     public void setMetricsRollingPercentileWindowBuckets(
-            Integer metricsRollingPercentileWindowBuckets) {
+            String metricsRollingPercentileWindowBuckets) {
         this.metricsRollingPercentileWindowBuckets = metricsRollingPercentileWindowBuckets;
     }
 
-    public Integer getMetricsRollingStatisticalWindowInMilliseconds() {
+    public String getMetricsRollingStatisticalWindowInMilliseconds() {
         return metricsRollingStatisticalWindowInMilliseconds;
     }
 
     public void setMetricsRollingStatisticalWindowInMilliseconds(
-            Integer metricsRollingStatisticalWindowInMilliseconds) {
+            String metricsRollingStatisticalWindowInMilliseconds) {
         this.metricsRollingStatisticalWindowInMilliseconds = metricsRollingStatisticalWindowInMilliseconds;
     }
 
-    public Integer getMetricsRollingStatisticalWindowBuckets() {
+    public String getMetricsRollingStatisticalWindowBuckets() {
         return metricsRollingStatisticalWindowBuckets;
     }
 
     public void setMetricsRollingStatisticalWindowBuckets(
-            Integer metricsRollingStatisticalWindowBuckets) {
+            String metricsRollingStatisticalWindowBuckets) {
         this.metricsRollingStatisticalWindowBuckets = metricsRollingStatisticalWindowBuckets;
     }
 
-    public Boolean getRequestLogEnabled() {
+    public String getRequestLogEnabled() {
         return requestLogEnabled;
     }
 
-    public void setRequestLogEnabled(Boolean requestLogEnabled) {
+    public void setRequestLogEnabled(String requestLogEnabled) {
         this.requestLogEnabled = requestLogEnabled;
     }
 
-    public Integer getCorePoolSize() {
+    public String getCorePoolSize() {
         return corePoolSize;
     }
 
-    public void setCorePoolSize(Integer corePoolSize) {
+    public void setCorePoolSize(String corePoolSize) {
         this.corePoolSize = corePoolSize;
     }
 
-    public Integer getMaximumSize() {
+    public String getMaximumSize() {
         return maximumSize;
     }
 
-    public void setMaximumSize(Integer maximumSize) {
+    public void setMaximumSize(String maximumSize) {
         this.maximumSize = maximumSize;
     }
 
-    public Integer getKeepAliveTime() {
+    public String getKeepAliveTime() {
         return keepAliveTime;
     }
 
-    public void setKeepAliveTime(Integer keepAliveTime) {
+    public void setKeepAliveTime(String keepAliveTime) {
         this.keepAliveTime = keepAliveTime;
     }
 
-    public Integer getMaxQueueSize() {
+    public String getMaxQueueSize() {
         return maxQueueSize;
     }
 
-    public void setMaxQueueSize(Integer maxQueueSize) {
+    public void setMaxQueueSize(String maxQueueSize) {
         this.maxQueueSize = maxQueueSize;
     }
 
-    public Integer getQueueSizeRejectionThreshold() {
+    public String getQueueSizeRejectionThreshold() {
         return queueSizeRejectionThreshold;
     }
 
     public void setQueueSizeRejectionThreshold(
-            Integer queueSizeRejectionThreshold) {
+            String queueSizeRejectionThreshold) {
         this.queueSizeRejectionThreshold = queueSizeRejectionThreshold;
     }
 
-    public Integer getThreadPoolRollingNumberStatisticalWindowInMilliseconds() {
+    public String getThreadPoolRollingNumberStatisticalWindowInMilliseconds() {
         return threadPoolRollingNumberStatisticalWindowInMilliseconds;
     }
 
     public void setThreadPoolRollingNumberStatisticalWindowInMilliseconds(
-            Integer threadPoolRollingNumberStatisticalWindowInMilliseconds) {
+            String threadPoolRollingNumberStatisticalWindowInMilliseconds) {
         this.threadPoolRollingNumberStatisticalWindowInMilliseconds = threadPoolRollingNumberStatisticalWindowInMilliseconds;
     }
 
-    public Integer getThreadPoolRollingNumberStatisticalWindowBuckets() {
+    public String getThreadPoolRollingNumberStatisticalWindowBuckets() {
         return threadPoolRollingNumberStatisticalWindowBuckets;
     }
 
     public void setThreadPoolRollingNumberStatisticalWindowBuckets(
-            Integer threadPoolRollingNumberStatisticalWindowBuckets) {
+            String threadPoolRollingNumberStatisticalWindowBuckets) {
         this.threadPoolRollingNumberStatisticalWindowBuckets = threadPoolRollingNumberStatisticalWindowBuckets;
     }
 
-    public Boolean getAllowMaximumSizeToDivergeFromCoreSize() {
+    public String getAllowMaximumSizeToDivergeFromCoreSize() {
         return allowMaximumSizeToDivergeFromCoreSize;
     }
 
     public void setAllowMaximumSizeToDivergeFromCoreSize(
-            Boolean allowMaximumSizeToDivergeFromCoreSize) {
+            String allowMaximumSizeToDivergeFromCoreSize) {
         this.allowMaximumSizeToDivergeFromCoreSize = allowMaximumSizeToDivergeFromCoreSize;
     }
 }
\ No newline at end of file
diff --git a/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentConfiguration.java b/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentConfiguration.java
index f06e738..f9b4a26 100644
--- a/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentConfiguration.java
+++ b/components-starter/camel-crypto-cms-starter/src/main/java/org/apache/camel/component/crypto/cms/springboot/CryptoCmsComponentConfiguration.java
@@ -67,15 +67,6 @@ public class CryptoCmsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getSignedDataVerifierConfiguration() {
         return signedDataVerifierConfiguration;
@@ -110,12 +101,4 @@ public class CryptoCmsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConfiguration.java b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConfiguration.java
index d878bdf..9a717f8 100644
--- a/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConfiguration.java
+++ b/components-starter/camel-crypto-starter/src/main/java/org/apache/camel/component/crypto/springboot/DigitalSignatureComponentConfiguration.java
@@ -64,15 +64,6 @@ public class DigitalSignatureComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public DigitalSignatureConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -99,14 +90,6 @@ public class DigitalSignatureComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class DigitalSignatureConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.crypto.DigitalSignatureConfiguration.class;
         /**
diff --git a/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentConfiguration.java b/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentConfiguration.java
index 7bd2c40..6f78ebd 100644
--- a/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentConfiguration.java
+++ b/components-starter/camel-dataformat-starter/src/main/java/org/apache/camel/component/dataformat/springboot/DataFormatComponentConfiguration.java
@@ -53,15 +53,6 @@ public class DataFormatComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class DataFormatComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentConfiguration.java b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentConfiguration.java
index 84382e6..79e7c92 100644
--- a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentConfiguration.java
+++ b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetComponentConfiguration.java
@@ -53,15 +53,6 @@ public class DataSetComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class DataSetComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentConfiguration.java b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentConfiguration.java
index a13f8d6..a85611f 100644
--- a/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentConfiguration.java
+++ b/components-starter/camel-dataset-starter/src/main/java/org/apache/camel/component/dataset/springboot/DataSetTestComponentConfiguration.java
@@ -53,15 +53,6 @@ public class DataSetTestComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class DataSetTestComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentConfiguration.java b/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentConfiguration.java
index e563fd1..394ac63 100644
--- a/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentConfiguration.java
+++ b/components-starter/camel-debezium-mongodb-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMongodbComponentConfiguration.java
@@ -48,17 +48,6 @@ public class DebeziumMongodbComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -85,14 +74,6 @@ public class DebeziumMongodbComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentConfiguration.java b/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentConfiguration.java
index 36fac7e..e62742c 100644
--- a/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentConfiguration.java
+++ b/components-starter/camel-debezium-mysql-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumMySqlComponentConfiguration.java
@@ -48,17 +48,6 @@ public class DebeziumMySqlComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -85,14 +74,6 @@ public class DebeziumMySqlComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentConfiguration.java b/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentConfiguration.java
index eb0654c..cd3fba4 100644
--- a/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentConfiguration.java
+++ b/components-starter/camel-debezium-postgres-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumPostgresComponentConfiguration.java
@@ -48,17 +48,6 @@ public class DebeziumPostgresComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -85,14 +74,6 @@ public class DebeziumPostgresComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
@@ -229,6 +210,13 @@ public class DebeziumPostgresComponentConfiguration
          */
         private Boolean includeUnknownDatatypes = false;
         /**
+         * Specify how INTERVAL columns should be represented in change events,
+         * including:'string' represents values as an exact ISO formatted
+         * string'numeric' (default) represents values using the inexact
+         * conversion into microseconds
+         */
+        private String intervalHandlingMode = "numeric";
+        /**
          * Maximum size of each batch of source records. Defaults to 2048.
          */
         private Integer maxBatchSize = 2048;
@@ -657,6 +645,14 @@ public class DebeziumPostgresComponentConfiguration
             this.includeUnknownDatatypes = includeUnknownDatatypes;
         }
 
+        public String getIntervalHandlingMode() {
+            return intervalHandlingMode;
+        }
+
+        public void setIntervalHandlingMode(String intervalHandlingMode) {
+            this.intervalHandlingMode = intervalHandlingMode;
+        }
+
         public Integer getMaxBatchSize() {
             return maxBatchSize;
         }
diff --git a/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentConfiguration.java b/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentConfiguration.java
index 25718e7..3ec0aec 100644
--- a/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentConfiguration.java
+++ b/components-starter/camel-debezium-sqlserver-starter/src/main/java/org/apache/camel/component/debezium/springboot/DebeziumSqlserverComponentConfiguration.java
@@ -48,17 +48,6 @@ public class DebeziumSqlserverComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -85,14 +74,6 @@ public class DebeziumSqlserverComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
@@ -168,6 +149,12 @@ public class DebeziumSqlserverComponentConfiguration
          */
         private String databaseServerName;
         /**
+         * The timezone of the server used to correctly shift the commit
+         * transaction timestamp on the client sideOptions include: Any valid
+         * Java ZoneId
+         */
+        private String databaseServerTimezone;
+        /**
          * Name of the SQL Server database user to be used when connecting to
          * the database.
          */
@@ -240,9 +227,9 @@ public class DebeziumSqlserverComponentConfiguration
          * The criteria for running a snapshot upon startup of the connector.
          * Options include: 'initial' (the default) to specify the connector
          * should run a snapshot only when no offsets are available for the
-         * logical server name; 'initial_schema_only' to specify the connector
-         * should run a snapshot of the schema when no offsets are available for
-         * the logical server name.
+         * logical server name; 'schema_only' to specify the connector should
+         * run a snapshot of the schema when no offsets are available for the
+         * logical server name.
          */
         private String snapshotMode = "initial";
         /**
@@ -289,6 +276,14 @@ public class DebeziumSqlserverComponentConfiguration
          * precision regardless of the database columns' precision .
          */
         private String timePrecisionMode = "adaptive";
+        /**
+         * Whether delete operations should be represented by a delete event and
+         * a subsquenttombstone event (true) or only by a delete event (false).
+         * Emitting the tombstone event (the default behavior) allows Kafka to
+         * completely delete all events pertaining to the given key once the
+         * source record got deleted.
+         */
+        private Boolean tombstonesOnDelete = false;
         private Class connectorClass;
         /**
          * The Converter class that should be used to serialize and deserialize
@@ -451,6 +446,14 @@ public class DebeziumSqlserverComponentConfiguration
             this.databaseServerName = databaseServerName;
         }
 
+        public String getDatabaseServerTimezone() {
+            return databaseServerTimezone;
+        }
+
+        public void setDatabaseServerTimezone(String databaseServerTimezone) {
+            this.databaseServerTimezone = databaseServerTimezone;
+        }
+
         public String getDatabaseUser() {
             return databaseUser;
         }
@@ -596,6 +599,14 @@ public class DebeziumSqlserverComponentConfiguration
             this.timePrecisionMode = timePrecisionMode;
         }
 
+        public Boolean getTombstonesOnDelete() {
+            return tombstonesOnDelete;
+        }
+
+        public void setTombstonesOnDelete(Boolean tombstonesOnDelete) {
+            this.tombstonesOnDelete = tombstonesOnDelete;
+        }
+
         public Class getConnectorClass() {
             return connectorClass;
         }
diff --git a/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentConfiguration.java b/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentConfiguration.java
index c4b8607..5d5226e 100644
--- a/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentConfiguration.java
+++ b/components-starter/camel-digitalocean-starter/src/main/java/org/apache/camel/component/digitalocean/springboot/DigitalOceanComponentConfiguration.java
@@ -53,15 +53,6 @@ public class DigitalOceanComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class DigitalOceanComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentConfiguration.java b/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentConfiguration.java
index 8cfec06..563635d 100644
--- a/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentConfiguration.java
+++ b/components-starter/camel-dns-starter/src/main/java/org/apache/camel/component/dns/springboot/DnsComponentConfiguration.java
@@ -52,15 +52,6 @@ public class DnsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class DnsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-dozer-starter/src/main/java/org/apache/camel/component/dozer/springboot/DozerComponentConfiguration.java b/components-starter/camel-dozer-starter/src/main/java/org/apache/camel/component/dozer/springboot/DozerComponentConfiguration.java
index 130e6eb..eb06f54 100644
--- a/components-starter/camel-dozer-starter/src/main/java/org/apache/camel/component/dozer/springboot/DozerComponentConfiguration.java
+++ b/components-starter/camel-dozer-starter/src/main/java/org/apache/camel/component/dozer/springboot/DozerComponentConfiguration.java
@@ -53,15 +53,6 @@ public class DozerComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class DozerComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentConfiguration.java b/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentConfiguration.java
index a3a80f0..d3a7fc4 100644
--- a/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentConfiguration.java
+++ b/components-starter/camel-drill-starter/src/main/java/org/apache/camel/component/drill/springboot/DrillComponentConfiguration.java
@@ -53,15 +53,6 @@ public class DrillComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class DrillComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java
index a780118..f9c76bd 100644
--- a/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java
+++ b/components-starter/camel-ehcache-starter/src/main/java/org/apache/camel/component/ehcache/springboot/EhcacheComponentConfiguration.java
@@ -17,7 +17,6 @@
 package org.apache.camel.component.ehcache.springboot;
 
 import java.util.Map;
-import java.util.Set;
 import javax.annotation.Generated;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.ehcache.CacheManager;
@@ -215,8 +214,10 @@ public class EhcacheComponentConfiguration
         private EventOrdering eventOrdering = EventOrdering.ORDERED;
         /**
          * Set the type of events to listen for
+         * (EVICTED,EXPIRED,REMOVED,CREATED,UPDATED). You can specify multiple
+         * entries separated by comma.
          */
-        private Set eventTypes;
+        private String eventTypes;
         /**
          * To configure the default action key. If a key is set in the message
          * header, then the key from the header takes precedence.
@@ -315,11 +316,11 @@ public class EhcacheComponentConfiguration
             this.eventOrdering = eventOrdering;
         }
 
-        public Set getEventTypes() {
+        public String getEventTypes() {
             return eventTypes;
         }
 
-        public void setEventTypes(Set eventTypes) {
+        public void setEventTypes(String eventTypes) {
             this.eventTypes = eventTypes;
         }
 
diff --git a/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConfiguration.java b/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConfiguration.java
index bc4e8ca..7a15707 100644
--- a/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConfiguration.java
+++ b/components-starter/camel-elasticsearch-rest-starter/src/main/java/org/apache/camel/component/elasticsearch/springboot/ElasticsearchComponentConfiguration.java
@@ -104,15 +104,6 @@ public class ElasticsearchComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getClient() {
         return client;
@@ -217,12 +208,4 @@ public class ElasticsearchComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentConfiguration.java b/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentConfiguration.java
index 9fbcf15..5c5197f 100644
--- a/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentConfiguration.java
+++ b/components-starter/camel-exec-starter/src/main/java/org/apache/camel/component/exec/springboot/ExecComponentConfiguration.java
@@ -52,15 +52,6 @@ public class ExecComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class ExecComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentConfiguration.java b/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentConfiguration.java
index d560c88..ce0e762 100644
--- a/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentConfiguration.java
+++ b/components-starter/camel-file-watch-starter/src/main/java/org/apache/camel/component/file/watch/springboot/FileWatchComponentConfiguration.java
@@ -74,17 +74,6 @@ public class FileWatchComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -142,14 +131,6 @@ public class FileWatchComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentConfiguration.java b/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentConfiguration.java
index cc935a9..90c31e9 100644
--- a/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentConfiguration.java
+++ b/components-starter/camel-flink-starter/src/main/java/org/apache/camel/component/flink/springboot/FlinkComponentConfiguration.java
@@ -72,15 +72,6 @@ public class FlinkComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getDataSet() {
         return dataSet;
@@ -129,12 +120,4 @@ public class FlinkComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentConfiguration.java b/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentConfiguration.java
index a8c49a4..e82f006 100644
--- a/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentConfiguration.java
+++ b/components-starter/camel-fop-starter/src/main/java/org/apache/camel/component/fop/springboot/FopComponentConfiguration.java
@@ -53,15 +53,6 @@ public class FopComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class FopComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java
index f5c5af5..12ed39b 100644
--- a/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java
+++ b/components-starter/camel-freemarker-starter/src/main/java/org/apache/camel/component/freemarker/springboot/FreemarkerComponentConfiguration.java
@@ -57,15 +57,6 @@ public class FreemarkerComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getConfiguration() {
         return configuration;
@@ -90,12 +81,4 @@ public class FreemarkerComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java b/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java
index 48468fe..9e6bc14 100644
--- a/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java
+++ b/components-starter/camel-ganglia-starter/src/main/java/org/apache/camel/component/ganglia/springboot/GangliaComponentConfiguration.java
@@ -60,15 +60,6 @@ public class GangliaComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public GangliaConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -95,14 +86,6 @@ public class GangliaComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class GangliaConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.ganglia.GangliaConfiguration.class;
         /**
diff --git a/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentConfiguration.java b/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentConfiguration.java
index bd1e5d6..a3e1300 100644
--- a/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentConfiguration.java
+++ b/components-starter/camel-geocoder-starter/src/main/java/org/apache/camel/component/geocoder/springboot/GeoCoderComponentConfiguration.java
@@ -53,15 +53,6 @@ public class GeoCoderComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class GeoCoderComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/springboot/GoogleBigQueryComponentConfiguration.java b/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/springboot/GoogleBigQueryComponentConfiguration.java
index 4be06b2..9d05114 100644
--- a/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/springboot/GoogleBigQueryComponentConfiguration.java
+++ b/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/springboot/GoogleBigQueryComponentConfiguration.java
@@ -65,15 +65,6 @@ public class GoogleBigQueryComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getProjectId() {
         return projectId;
@@ -116,14 +107,6 @@ public class GoogleBigQueryComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class GoogleBigQueryConnectionFactoryNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory.class;
         private String credentialsFileLocation;
diff --git a/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java b/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
index ec240ce..285db2e 100644
--- a/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
+++ b/components-starter/camel-google-bigquery-starter/src/main/java/org/apache/camel/component/google/bigquery/sql/springboot/GoogleBigQuerySQLComponentConfiguration.java
@@ -61,15 +61,6 @@ public class GoogleBigQuerySQLComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getProjectId() {
         return projectId;
@@ -104,14 +95,6 @@ public class GoogleBigQuerySQLComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class GoogleBigQueryConnectionFactoryNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.google.bigquery.GoogleBigQueryConnectionFactory.class;
         private String credentialsFileLocation;
diff --git a/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java b/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
index 59553e6..fbc699e 100644
--- a/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
+++ b/components-starter/camel-google-calendar-starter/src/main/java/org/apache/camel/component/google/calendar/stream/springboot/GoogleCalendarStreamComponentConfiguration.java
@@ -54,17 +54,6 @@ public class GoogleCalendarStreamComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -99,14 +88,6 @@ public class GoogleCalendarStreamComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
index 5d11467..2262d60 100644
--- a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
+++ b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
@@ -51,17 +51,6 @@ public class GoogleMailStreamComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -96,14 +85,6 @@ public class GoogleMailStreamComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
index f7d5a97..7e99f59 100644
--- a/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
+++ b/components-starter/camel-google-sheets-starter/src/main/java/org/apache/camel/component/google/sheets/stream/springboot/GoogleSheetsStreamComponentConfiguration.java
@@ -53,17 +53,6 @@ public class GoogleSheetsStreamComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -98,14 +87,6 @@ public class GoogleSheetsStreamComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-graphql-starter/src/main/java/org/apache/camel/component/graphql/springboot/GraphqlComponentConfiguration.java b/components-starter/camel-graphql-starter/src/main/java/org/apache/camel/component/graphql/springboot/GraphqlComponentConfiguration.java
index cc8619a..6418302 100644
--- a/components-starter/camel-graphql-starter/src/main/java/org/apache/camel/component/graphql/springboot/GraphqlComponentConfiguration.java
+++ b/components-starter/camel-graphql-starter/src/main/java/org/apache/camel/component/graphql/springboot/GraphqlComponentConfiguration.java
@@ -52,15 +52,6 @@ public class GraphqlComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class GraphqlComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/HazelcastAtomicnumberComponentConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/HazelcastAtomicnumberComponentConfiguration.java
index 8089b9a..fb9204e 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/HazelcastAtomicnumberComponentConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/atomicnumber/springboot/HazelcastAtomicnumberComponentConfiguration.java
@@ -65,15 +65,6 @@ public class HazelcastAtomicnumberComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getHazelcastInstance() {
         return hazelcastInstance;
@@ -106,12 +97,4 @@ public class HazelcastAtomicnumberComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/instance/springboot/HazelcastInstanceComponentConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/instance/springboot/HazelcastInstanceComponentConfiguration.java
index a92830e..38b94c1 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/instance/springboot/HazelcastInstanceComponentConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/instance/springboot/HazelcastInstanceComponentConfiguration.java
@@ -55,17 +55,6 @@ public class HazelcastInstanceComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -99,14 +88,6 @@ public class HazelcastInstanceComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/springboot/HazelcastRingbufferComponentConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/springboot/HazelcastRingbufferComponentConfiguration.java
index 43284cb..746ff05 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/springboot/HazelcastRingbufferComponentConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/ringbuffer/springboot/HazelcastRingbufferComponentConfiguration.java
@@ -65,15 +65,6 @@ public class HazelcastRingbufferComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getHazelcastInstance() {
         return hazelcastInstance;
@@ -106,12 +97,4 @@ public class HazelcastRingbufferComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/set/springboot/HazelcastSetComponentConfiguration.java b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/set/springboot/HazelcastSetComponentConfiguration.java
index e27fabd..a3bbb39 100644
--- a/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/set/springboot/HazelcastSetComponentConfiguration.java
+++ b/components-starter/camel-hazelcast-starter/src/main/java/org/apache/camel/component/hazelcast/set/springboot/HazelcastSetComponentConfiguration.java
@@ -21,7 +21,7 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * The camel Endpoint to access Hazelcast distributed set.
+ * The hazelcast-set component is used to access Hazelcast distributed set.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
diff --git a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
index 7d10e99..2e6f87b 100644
--- a/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
+++ b/components-starter/camel-http-starter/src/main/java/org/apache/camel/component/http/springboot/HttpComponentConfiguration.java
@@ -157,15 +157,6 @@ public class HttpComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getHttpClientConfigurer() {
         return httpClientConfigurer;
@@ -319,12 +310,4 @@ public class HttpComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConfiguration.java
index 991dede..59a2a77 100644
--- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConfiguration.java
+++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/compute/springboot/IgniteComputeComponentConfiguration.java
@@ -69,15 +69,6 @@ public class IgniteComputeComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getIgnite() {
         return ignite;
@@ -118,12 +109,4 @@ public class IgniteComputeComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConfiguration.java
index a4878f8..512d8d5 100644
--- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConfiguration.java
+++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/events/springboot/IgniteEventsComponentConfiguration.java
@@ -57,17 +57,6 @@ public class IgniteEventsComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -109,14 +98,6 @@ public class IgniteEventsComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConfiguration.java
index 8afa6da..e077ee2 100644
--- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConfiguration.java
+++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/idgen/springboot/IgniteIdGenComponentConfiguration.java
@@ -67,15 +67,6 @@ public class IgniteIdGenComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getIgnite() {
         return ignite;
@@ -116,12 +107,4 @@ public class IgniteIdGenComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConfiguration.java
index 3bdc198..ebb30e2 100644
--- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConfiguration.java
+++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/queue/springboot/IgniteQueueComponentConfiguration.java
@@ -67,15 +67,6 @@ public class IgniteQueueComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getIgnite() {
         return ignite;
@@ -116,12 +107,4 @@ public class IgniteQueueComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConfiguration.java b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConfiguration.java
index 3a5caaf..761323c 100644
--- a/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConfiguration.java
+++ b/components-starter/camel-ignite-starter/src/main/java/org/apache/camel/component/ignite/set/springboot/IgniteSetComponentConfiguration.java
@@ -67,15 +67,6 @@ public class IgniteSetComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getIgnite() {
         return ignite;
@@ -116,12 +107,4 @@ public class IgniteSetComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConfiguration.java b/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConfiguration.java
index 1a2a434..3220710 100644
--- a/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConfiguration.java
+++ b/components-starter/camel-influxdb-starter/src/main/java/org/apache/camel/component/influxdb/springboot/InfluxDbComponentConfiguration.java
@@ -53,15 +53,6 @@ public class InfluxDbComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class InfluxDbComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-iota-starter/src/main/java/org/apache/camel/component/iota/springboot/IOTAComponentConfiguration.java b/components-starter/camel-iota-starter/src/main/java/org/apache/camel/component/iota/springboot/IOTAComponentConfiguration.java
index 62e5886..8dccdbf 100644
--- a/components-starter/camel-iota-starter/src/main/java/org/apache/camel/component/iota/springboot/IOTAComponentConfiguration.java
+++ b/components-starter/camel-iota-starter/src/main/java/org/apache/camel/component/iota/springboot/IOTAComponentConfiguration.java
@@ -52,15 +52,6 @@ public class IOTAComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class IOTAComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentConfiguration.java b/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentConfiguration.java
index 787537d..f389648 100644
--- a/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentConfiguration.java
+++ b/components-starter/camel-ipfs-starter/src/main/java/org/apache/camel/component/ipfs/springboot/IPFSComponentConfiguration.java
@@ -38,6 +38,14 @@ public class IPFSComponentConfiguration
      */
     private Boolean enabled;
     /**
+     * The ipfs host
+     */
+    private String ipfsHost = "127.0.0.1";
+    /**
+     * The ipfs port
+     */
+    private Integer ipfsPort = 5001;
+    /**
      * Whether the component should use basic property binding (Camel 2.x) or
      * the newer property binding with additional capabilities
      */
@@ -53,15 +61,22 @@ public class IPFSComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
+
+    public String getIpfsHost() {
+        return ipfsHost;
+    }
+
+    public void setIpfsHost(String ipfsHost) {
+        this.ipfsHost = ipfsHost;
+    }
+
+    public Integer getIpfsPort() {
+        return ipfsPort;
+    }
+
+    public void setIpfsPort(Integer ipfsPort) {
+        this.ipfsPort = ipfsPort;
+    }
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +93,4 @@ public class IPFSComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentConfiguration.java b/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentConfiguration.java
index 1aafc2d..bba98d7 100644
--- a/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentConfiguration.java
+++ b/components-starter/camel-jcache-starter/src/main/java/org/apache/camel/component/jcache/springboot/JCacheComponentConfiguration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.jcache.springboot;
 
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -47,10 +48,14 @@ public class JCacheComponentConfiguration
      */
     private String cacheConfiguration;
     /**
-     * The Properties for the javax.cache.spi.CachingProvider to create the
-     * CacheManager. The option is a java.util.Properties type.
+     * Properties to configure jcache
      */
-    private String cacheConfigurationProperties;
+    private Map cacheConfigurationProperties;
+    /**
+     * References to an existing Properties or Map to lookup in the registry to
+     * use for configuring jcache.
+     */
+    private String cacheConfigurationPropertiesRef;
     /**
      * An implementation specific URI for the CacheManager
      */
@@ -97,15 +102,23 @@ public class JCacheComponentConfiguration
         this.cacheConfiguration = cacheConfiguration;
     }
 
-    public String getCacheConfigurationProperties() {
+    public Map getCacheConfigurationProperties() {
         return cacheConfigurationProperties;
     }
 
-    public void setCacheConfigurationProperties(
-            String cacheConfigurationProperties) {
+    public void setCacheConfigurationProperties(Map cacheConfigurationProperties) {
         this.cacheConfigurationProperties = cacheConfigurationProperties;
     }
 
+    public String getCacheConfigurationPropertiesRef() {
+        return cacheConfigurationPropertiesRef;
+    }
+
+    public void setCacheConfigurationPropertiesRef(
+            String cacheConfigurationPropertiesRef) {
+        this.cacheConfigurationPropertiesRef = cacheConfigurationPropertiesRef;
+    }
+
     public String getConfigurationUri() {
         return configurationUri;
     }
diff --git a/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentConfiguration.java b/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentConfiguration.java
index 0e28075..2f35482 100644
--- a/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentConfiguration.java
+++ b/components-starter/camel-jdbc-starter/src/main/java/org/apache/camel/component/jdbc/springboot/JdbcComponentConfiguration.java
@@ -58,15 +58,6 @@ public class JdbcComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getDataSource() {
         return dataSource;
@@ -91,12 +82,4 @@ public class JdbcComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
index 7c5191d..439f1b0 100644
--- a/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
+++ b/components-starter/camel-jetty-starter/src/main/java/org/apache/camel/component/jetty9/springboot/JettyHttpComponentConfiguration9.java
@@ -201,17 +201,6 @@ public class JettyHttpComponentConfiguration9
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -473,14 +462,6 @@ public class JettyHttpComponentConfiguration9
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-jing-starter/src/main/java/org/apache/camel/component/validator/jing/springboot/JingComponentConfiguration.java b/components-starter/camel-jing-starter/src/main/java/org/apache/camel/component/validator/jing/springboot/JingComponentConfiguration.java
index 6a7b03e..efe6fc7 100644
--- a/components-starter/camel-jing-starter/src/main/java/org/apache/camel/component/validator/jing/springboot/JingComponentConfiguration.java
+++ b/components-starter/camel-jing-starter/src/main/java/org/apache/camel/component/validator/jing/springboot/JingComponentConfiguration.java
@@ -52,15 +52,6 @@ public class JingComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class JingComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentConfiguration.java b/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentConfiguration.java
index ed0ae6d..d407c6e 100644
--- a/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentConfiguration.java
+++ b/components-starter/camel-jira-starter/src/main/java/org/apache/camel/component/jira/springboot/JiraComponentConfiguration.java
@@ -37,7 +37,7 @@ public class JiraComponentConfiguration
      */
     private Boolean enabled;
     /**
-     * The JiraConfiguration parameters
+     * To use a shared base jira configuration.
      */
     private JiraConfigurationNestedConfiguration configuration;
     /**
diff --git a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
index bafbd4b..48758fe 100644
--- a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
+++ b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
@@ -42,6 +42,20 @@ public class JmsComponentConfiguration
      */
     private Boolean enabled;
     /**
+     * Whether to auto-discover ConnectionFactory from the registry, if no
+     * connection factory has been configured. If only one instance of
+     * ConnectionFactory is found then it will be used. This is enabled by
+     * default.
+     */
+    private Boolean allowAutoWiredConnectionFactory = false;
+    /**
+     * Whether to auto-discover DestinationResolver from the registry, if no
+     * destination resolver has been configured. If only one instance of
+     * DestinationResolver is found then it will be used. This is enabled by
+     * default.
+     */
+    private Boolean allowAutoWiredDestinationResolver = false;
+    /**
      * To use a shared JMS configuration. The option is a
      * org.apache.camel.component.jms.JmsConfiguration type.
      */
@@ -639,6 +653,24 @@ public class JmsComponentConfiguration
      */
     private Boolean bridgeErrorHandler = false;
 
+    public Boolean getAllowAutoWiredConnectionFactory() {
+        return allowAutoWiredConnectionFactory;
+    }
+
+    public void setAllowAutoWiredConnectionFactory(
+            Boolean allowAutoWiredConnectionFactory) {
+        this.allowAutoWiredConnectionFactory = allowAutoWiredConnectionFactory;
+    }
+
+    public Boolean getAllowAutoWiredDestinationResolver() {
+        return allowAutoWiredDestinationResolver;
+    }
+
+    public void setAllowAutoWiredDestinationResolver(
+            Boolean allowAutoWiredDestinationResolver) {
+        this.allowAutoWiredDestinationResolver = allowAutoWiredDestinationResolver;
+    }
+
     public String getConfiguration() {
         return configuration;
     }
diff --git a/components-starter/camel-jmx-starter/src/main/java/org/apache/camel/component/jmx/springboot/JMXComponentConfiguration.java b/components-starter/camel-jmx-starter/src/main/java/org/apache/camel/component/jmx/springboot/JMXComponentConfiguration.java
index 39604a5..9019a56 100644
--- a/components-starter/camel-jmx-starter/src/main/java/org/apache/camel/component/jmx/springboot/JMXComponentConfiguration.java
+++ b/components-starter/camel-jmx-starter/src/main/java/org/apache/camel/component/jmx/springboot/JMXComponentConfiguration.java
@@ -42,17 +42,6 @@ public class JMXComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -70,14 +59,6 @@ public class JMXComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentConfiguration.java b/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentConfiguration.java
index 4df0568..2393f3b 100644
--- a/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentConfiguration.java
+++ b/components-starter/camel-jolt-starter/src/main/java/org/apache/camel/component/jolt/springboot/JoltComponentConfiguration.java
@@ -59,15 +59,6 @@ public class JoltComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getTransform() {
         return transform;
@@ -92,12 +83,4 @@ public class JoltComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-jsch-starter/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentConfiguration.java b/components-starter/camel-jsch-starter/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentConfiguration.java
index 5188e3c..b610154 100644
--- a/components-starter/camel-jsch-starter/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentConfiguration.java
+++ b/components-starter/camel-jsch-starter/src/main/java/org/apache/camel/component/scp/springboot/ScpComponentConfiguration.java
@@ -58,15 +58,6 @@ public class ScpComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getVerboseLogging() {
         return verboseLogging;
@@ -91,12 +82,4 @@ public class ScpComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-json-validator-starter/src/main/java/org/apache/camel/component/jsonvalidator/springboot/JsonValidatorComponentConfiguration.java b/components-starter/camel-json-validator-starter/src/main/java/org/apache/camel/component/jsonvalidator/springboot/JsonValidatorComponentConfiguration.java
index dda33a9..329859e 100644
--- a/components-starter/camel-json-validator-starter/src/main/java/org/apache/camel/component/jsonvalidator/springboot/JsonValidatorComponentConfiguration.java
+++ b/components-starter/camel-json-validator-starter/src/main/java/org/apache/camel/component/jsonvalidator/springboot/JsonValidatorComponentConfiguration.java
@@ -52,15 +52,6 @@ public class JsonValidatorComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class JsonValidatorComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
index aca799b..81a655a 100644
--- a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
+++ b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.kafka.springboot;
 
+import java.util.Map;
 import java.util.concurrent.ExecutorService;
 import javax.annotation.Generated;
 import org.apache.camel.component.kafka.serde.KafkaHeaderDeserializer;
@@ -205,6 +206,15 @@ public class KafkaComponentConfiguration
     public static class KafkaConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.kafka.KafkaConfiguration.class;
         /**
+         * Sets additional properties for either kafka consumer or kafka
+         * producer in case they can't be set directly on the camel
+         * configurations (e.g: new Kafka properties that are not reflected yet
+         * in Camel configurations), the properties have to be prefixed with
+         * additionalProperties.. E.g:
+         * additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro
+         */
+        private Map additionalProperties;
+        /**
          * Whether to allow doing manual commits via KafkaManualCommit. If this
          * option is enabled then an instance of KafkaManualCommit is stored on
          * the Exchange message header, which allows end users to access this
@@ -805,6 +815,14 @@ public class KafkaComponentConfiguration
          */
         private Integer workerPoolMaxSize = 20;
 
+        public Map getAdditionalProperties() {
+            return additionalProperties;
+        }
+
+        public void setAdditionalProperties(Map additionalProperties) {
+            this.additionalProperties = additionalProperties;
+        }
+
         public Boolean getAllowManualCommit() {
             return allowManualCommit;
         }
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentConfiguration.java
index 16dfa63..e9c6b9d 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/config_maps/springboot/KubernetesConfigMapsComponentConfiguration.java
@@ -53,15 +53,6 @@ public class KubernetesConfigMapsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class KubernetesConfigMapsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentConfiguration.java
index df54441..fce14f6 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes/springboot/KubernetesPersistentVolumesComponentConfiguration.java
@@ -53,15 +53,6 @@ public class KubernetesPersistentVolumesComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class KubernetesPersistentVolumesComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentConfiguration.java
index 552a6fc..95c1074 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/springboot/KubernetesPersistentVolumesClaimsComponentConfiguration.java
@@ -54,15 +54,6 @@ public class KubernetesPersistentVolumesClaimsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -79,12 +70,4 @@ public class KubernetesPersistentVolumesClaimsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentConfiguration.java
index 81c7eaf..7a6eb32 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/resources_quota/springboot/KubernetesResourcesQuotaComponentConfiguration.java
@@ -53,15 +53,6 @@ public class KubernetesResourcesQuotaComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class KubernetesResourcesQuotaComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentConfiguration.java
index 4038b38..ff13d62 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/secrets/springboot/KubernetesSecretsComponentConfiguration.java
@@ -53,15 +53,6 @@ public class KubernetesSecretsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class KubernetesSecretsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentConfiguration.java
index 5931bfd..2891ed7 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/service_accounts/springboot/KubernetesServiceAccountsComponentConfiguration.java
@@ -53,15 +53,6 @@ public class KubernetesServiceAccountsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class KubernetesServiceAccountsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentConfiguration.java
index b55f94b..ed866eb 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/kubernetes/services/springboot/KubernetesServicesComponentConfiguration.java
@@ -21,8 +21,8 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 /**
- * The Kubernetes Service Accounts component provides a producer to execute
- * service operations and a consumer to consume service events.
+ * The Kubernetes Services component provides a producer to execute service
+ * operations and a consumer to consume service events.
  * 
  * Generated by camel-package-maven-plugin - do not edit this file!
  */
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConfiguration.java
index 96af576..38688a5 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/build_configs/springboot/OpenshiftBuildConfigsComponentConfiguration.java
@@ -53,15 +53,6 @@ public class OpenshiftBuildConfigsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class OpenshiftBuildConfigsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConfiguration.java b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConfiguration.java
index fde49bd..a916e4d 100644
--- a/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConfiguration.java
+++ b/components-starter/camel-kubernetes-starter/src/main/java/org/apache/camel/component/openshift/builds/springboot/OpenshiftBuildsComponentConfiguration.java
@@ -53,15 +53,6 @@ public class OpenshiftBuildsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class OpenshiftBuildsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConfiguration.java b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConfiguration.java
index 415694e..32212e3 100644
--- a/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConfiguration.java
+++ b/components-starter/camel-kudu-starter/src/main/java/org/apache/camel/component/kudu/springboot/KuduComponentConfiguration.java
@@ -54,15 +54,6 @@ public class KuduComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -79,12 +70,4 @@ public class KuduComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-language-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentConfiguration.java b/components-starter/camel-language-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentConfiguration.java
index 3c4b185..343f412 100644
--- a/components-starter/camel-language-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentConfiguration.java
+++ b/components-starter/camel-language-starter/src/main/java/org/apache/camel/component/language/springboot/LanguageComponentConfiguration.java
@@ -53,15 +53,6 @@ public class LanguageComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class LanguageComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ldap-starter/src/main/java/org/apache/camel/component/ldap/springboot/LdapComponentConfiguration.java b/components-starter/camel-ldap-starter/src/main/java/org/apache/camel/component/ldap/springboot/LdapComponentConfiguration.java
index 6a8cd90..62e40dd 100644
--- a/components-starter/camel-ldap-starter/src/main/java/org/apache/camel/component/ldap/springboot/LdapComponentConfiguration.java
+++ b/components-starter/camel-ldap-starter/src/main/java/org/apache/camel/component/ldap/springboot/LdapComponentConfiguration.java
@@ -53,15 +53,6 @@ public class LdapComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class LdapComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ldif-starter/src/main/java/org/apache/camel/component/ldif/springboot/LdifComponentConfiguration.java b/components-starter/camel-ldif-starter/src/main/java/org/apache/camel/component/ldif/springboot/LdifComponentConfiguration.java
index df7bb43..879ed93 100644
--- a/components-starter/camel-ldif-starter/src/main/java/org/apache/camel/component/ldif/springboot/LdifComponentConfiguration.java
+++ b/components-starter/camel-ldif-starter/src/main/java/org/apache/camel/component/ldif/springboot/LdifComponentConfiguration.java
@@ -53,15 +53,6 @@ public class LdifComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class LdifComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConfiguration.java b/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConfiguration.java
index ffa5c7f..844f905 100644
--- a/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConfiguration.java
+++ b/components-starter/camel-log-starter/src/main/java/org/apache/camel/component/log/springboot/LogComponentConfiguration.java
@@ -59,15 +59,6 @@ public class LogComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getExchangeFormatter() {
         return exchangeFormatter;
@@ -92,12 +83,4 @@ public class LogComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java
index 48ce597..26cb489 100644
--- a/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java
+++ b/components-starter/camel-lucene-starter/src/main/java/org/apache/camel/component/lucene/springboot/LuceneComponentConfiguration.java
@@ -61,15 +61,6 @@ public class LuceneComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public LuceneConfigurationNestedConfiguration getConfig() {
         return config;
@@ -95,14 +86,6 @@ public class LuceneComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class LuceneConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.lucene.LuceneConfiguration.class;
         /**
diff --git a/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConfiguration.java b/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConfiguration.java
index 92f2610..6f68314 100644
--- a/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConfiguration.java
+++ b/components-starter/camel-lumberjack-starter/src/main/java/org/apache/camel/component/lumberjack/springboot/LumberjackComponentConfiguration.java
@@ -53,17 +53,6 @@ public class LumberjackComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -98,14 +87,6 @@ public class LumberjackComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConfiguration.java b/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConfiguration.java
index 252e5b4..47bd19a 100644
--- a/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConfiguration.java
+++ b/components-starter/camel-master-starter/src/main/java/org/apache/camel/component/master/springboot/MasterComponentConfiguration.java
@@ -54,17 +54,6 @@ public class MasterComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -98,14 +87,6 @@ public class MasterComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentConfiguration.java b/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentConfiguration.java
index bdafbf7..ad8516e 100644
--- a/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentConfiguration.java
+++ b/components-starter/camel-metrics-starter/src/main/java/org/apache/camel/component/metrics/springboot/MetricsComponentConfiguration.java
@@ -58,15 +58,6 @@ public class MetricsComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getMetricRegistry() {
         return metricRegistry;
@@ -91,12 +82,4 @@ public class MetricsComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConfiguration.java b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConfiguration.java
index 01b4def..53383fc 100644
--- a/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConfiguration.java
+++ b/components-starter/camel-micrometer-starter/src/main/java/org/apache/camel/component/micrometer/springboot/MicrometerComponentConfiguration.java
@@ -58,15 +58,6 @@ public class MicrometerComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getMetricsRegistry() {
         return metricsRegistry;
@@ -91,12 +82,4 @@ public class MicrometerComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentConfiguration.java b/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentConfiguration.java
index 98be5ea..25f6831 100644
--- a/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentConfiguration.java
+++ b/components-starter/camel-mock-starter/src/main/java/org/apache/camel/component/mock/springboot/MockComponentConfiguration.java
@@ -53,15 +53,6 @@ public class MockComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class MockComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentConfiguration.java b/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentConfiguration.java
index 5a33b7e..10745e7 100644
--- a/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentConfiguration.java
+++ b/components-starter/camel-mongodb-starter/src/main/java/org/apache/camel/component/mongodb/springboot/MongoDbComponentConfiguration.java
@@ -39,7 +39,7 @@ public class MongoDbComponentConfiguration
     /**
      * Set a client used for connection: all endpoints generated from the
      * component will share this connection bean. The option is a
-     * com.mongodb.MongoClient type.
+     * com.mongodb.client.MongoClient type.
      */
     private String mongoConnection;
     /**
diff --git a/components-starter/camel-msv-starter/src/main/java/org/apache/camel/component/validator/msv/springboot/MsvComponentConfiguration.java b/components-starter/camel-msv-starter/src/main/java/org/apache/camel/component/validator/msv/springboot/MsvComponentConfiguration.java
index d3b0d0a..d957091 100644
--- a/components-starter/camel-msv-starter/src/main/java/org/apache/camel/component/validator/msv/springboot/MsvComponentConfiguration.java
+++ b/components-starter/camel-msv-starter/src/main/java/org/apache/camel/component/validator/msv/springboot/MsvComponentConfiguration.java
@@ -64,15 +64,6 @@ public class MsvComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getSchemaFactory() {
         return schemaFactory;
@@ -105,12 +96,4 @@ public class MsvComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentConfiguration.java b/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentConfiguration.java
index f81adc8..ae3e9d2 100644
--- a/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentConfiguration.java
+++ b/components-starter/camel-mustache-starter/src/main/java/org/apache/camel/component/mustache/springboot/MustacheComponentConfiguration.java
@@ -57,15 +57,6 @@ public class MustacheComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getMustacheFactory() {
         return mustacheFactory;
@@ -90,12 +81,4 @@ public class MustacheComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/component/mvel/springboot/MvelComponentConfiguration.java b/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/component/mvel/springboot/MvelComponentConfiguration.java
index 5dbc45a..cca982c 100644
--- a/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/component/mvel/springboot/MvelComponentConfiguration.java
+++ b/components-starter/camel-mvel-starter/src/main/java/org/apache/camel/component/mvel/springboot/MvelComponentConfiguration.java
@@ -52,15 +52,6 @@ public class MvelComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class MvelComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentConfiguration.java b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentConfiguration.java
index 3bdbc0b..f3cd7b3 100644
--- a/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentConfiguration.java
+++ b/components-starter/camel-mybatis-starter/src/main/java/org/apache/camel/component/mybatis/springboot/MyBatisBeanComponentConfiguration.java
@@ -63,15 +63,6 @@ public class MyBatisBeanComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getSqlSessionFactory() {
         return sqlSessionFactory;
@@ -104,12 +95,4 @@ public class MyBatisBeanComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java b/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
index 949fd77..1127e3b 100644
--- a/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
+++ b/components-starter/camel-nagios-starter/src/main/java/org/apache/camel/component/nagios/springboot/NagiosComponentConfiguration.java
@@ -19,10 +19,8 @@ package org.apache.camel.component.nagios.springboot;
 import javax.annotation.Generated;
 import com.googlecode.jsendnsca.NagiosSettings;
 import com.googlecode.jsendnsca.encryption.Encryption;
-import org.apache.camel.component.nagios.NagiosEncryptionMethod;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 
 /**
  * To send passive checks to Nagios using JSendNSCA.
@@ -60,15 +58,6 @@ public class NagiosComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public NagiosConfigurationNestedConfiguration getConfiguration() {
         return configuration;
@@ -95,14 +84,6 @@ public class NagiosComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class NagiosConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.nagios.NagiosConfiguration.class;
         /**
@@ -114,11 +95,6 @@ public class NagiosComponentConfiguration
          */
         private Encryption encryption;
         /**
-         * To specify an encryption method.
-         */
-        @Deprecated
-        private NagiosEncryptionMethod encryptionMethod;
-        /**
          * This is the address of the Nagios host where checks should be send.
          */
         private String host;
@@ -152,17 +128,6 @@ public class NagiosComponentConfiguration
             this.encryption = encryption;
         }
 
-        @Deprecated
-        @DeprecatedConfigurationProperty
-        public NagiosEncryptionMethod getEncryptionMethod() {
-            return encryptionMethod;
-        }
-
-        @Deprecated
-        public void setEncryptionMethod(NagiosEncryptionMethod encryptionMethod) {
-            this.encryptionMethod = encryptionMethod;
-        }
-
         public String getHost() {
             return host;
         }
diff --git a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
index 02f0249..21abe32 100644
--- a/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
+++ b/components-starter/camel-nats-starter/src/main/java/org/apache/camel/component/nats/springboot/NatsComponentConfiguration.java
@@ -37,6 +37,11 @@ public class NatsComponentConfiguration
      */
     private Boolean enabled;
     /**
+     * URLs to one or more NAT servers. Use comma to separate URLs when
+     * specifying multiple servers.
+     */
+    private String servers;
+    /**
      * Enable usage of global SSL context parameters.
      */
     private Boolean useGlobalSslContextParameters = false;
@@ -66,6 +71,14 @@ public class NatsComponentConfiguration
      */
     private Boolean bridgeErrorHandler = false;
 
+    public String getServers() {
+        return servers;
+    }
+
+    public void setServers(String servers) {
+        this.servers = servers;
+    }
+
     public Boolean getUseGlobalSslContextParameters() {
         return useGlobalSslContextParameters;
     }
diff --git a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
index 56e255e..fc39192 100644
--- a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
+++ b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
@@ -65,10 +65,16 @@ public class NettyHttpComponentConfiguration
      */
     private Boolean useGlobalSslContextParameters = false;
     /**
-     * The thread pool size for the EventExecutorGroup if its in use. The
-     * default value is 16.
+     * Sets a maximum thread pool size for the netty consumer ordered thread
+     * pool. The default size is 2 x cpu core 1. Setting this value to eg 10
+     * will then use 10 threads unless 2 x cpu core 1 is a higher value, which
+     * then will override and be used. For example if there are 8 cores, then
+     * the consumer thread pool will be 17. This thread pool is used to route
+     * messages received from Netty by Camel. We use a separate thread pool to
+     * ensure ordering of messages and also in case some messages will block,
+     * then nettys worker threads (event loop) wont be affected.
      */
-    private Integer maximumPoolSize = 16;
+    private Integer maximumPoolSize;
     /**
      * To use the given EventExecutorGroup. The option is a
      * io.netty.util.concurrent.EventExecutorGroup type.
diff --git a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
index 8d208d0..2857fc8 100644
--- a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
+++ b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
@@ -52,10 +52,16 @@ public class NettyComponentConfiguration
      */
     private Boolean enabled;
     /**
-     * The thread pool size for the EventExecutorGroup if its in use. The
-     * default value is 16.
+     * Sets a maximum thread pool size for the netty consumer ordered thread
+     * pool. The default size is 2 x cpu core 1. Setting this value to eg 10
+     * will then use 10 threads unless 2 x cpu core 1 is a higher value, which
+     * then will override and be used. For example if there are 8 cores, then
+     * the consumer thread pool will be 17. This thread pool is used to route
+     * messages received from Netty by Camel. We use a separate thread pool to
+     * ensure ordering of messages and also in case some messages will block,
+     * then nettys worker threads (event loop) wont be affected.
      */
-    private Integer maximumPoolSize = 16;
+    private Integer maximumPoolSize;
     /**
      * To use the NettyConfiguration as configuration when creating endpoints.
      */
@@ -381,7 +387,7 @@ public class NettyComponentConfiguration
         private Integer backlog;
         /**
          * When netty works on nio mode, it uses default bossCount parameter
-         * from Netty, which is 1. User can use this operation to override the
+         * from Netty, which is 1. User can use this option to override the
          * default bossCount from Netty
          */
         private Integer bossCount = 1;
@@ -550,8 +556,8 @@ public class NettyComponentConfiguration
         private String trustStoreResource;
         /**
          * When netty works on nio mode, it uses default workerCount parameter
-         * from Netty, which is cpu_core_threads x 2. User can use this
-         * operation to override the default workerCount from Netty.
+         * from Netty (which is cpu_core_threads x 2). User can use this option
+         * to override the default workerCount from Netty.
          */
         private Integer workerCount;
         /**
diff --git a/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentConfiguration.java b/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentConfiguration.java
index 43ea96e..79e83c0 100644
--- a/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentConfiguration.java
+++ b/components-starter/camel-nsq-starter/src/main/java/org/apache/camel/component/nsq/springboot/NsqComponentConfiguration.java
@@ -37,6 +37,11 @@ public class NsqComponentConfiguration
      */
     private Boolean enabled;
     /**
+     * The hostnames of one or more nsqlookupd servers (consumer) or nsqd
+     * servers (producer).
+     */
+    private String servers;
+    /**
      * Enable usage of global SSL context parameters.
      */
     private Boolean useGlobalSslContextParameters = false;
@@ -66,6 +71,14 @@ public class NsqComponentConfiguration
      */
     private Boolean bridgeErrorHandler = false;
 
+    public String getServers() {
+        return servers;
+    }
+
+    public void setServers(String servers) {
+        this.servers = servers;
+    }
+
     public Boolean getUseGlobalSslContextParameters() {
         return useGlobalSslContextParameters;
     }
diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/cinder/springboot/CinderComponentConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/cinder/springboot/CinderComponentConfiguration.java
index e103a2d..8f3326f 100644
--- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/cinder/springboot/CinderComponentConfiguration.java
+++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/cinder/springboot/CinderComponentConfiguration.java
@@ -53,15 +53,6 @@ public class CinderComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class CinderComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/glance/springboot/GlanceComponentConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/glance/springboot/GlanceComponentConfiguration.java
index af6aaa3..3045f1c 100644
--- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/glance/springboot/GlanceComponentConfiguration.java
+++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/glance/springboot/GlanceComponentConfiguration.java
@@ -53,15 +53,6 @@ public class GlanceComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class GlanceComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/keystone/springboot/KeystoneComponentConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/keystone/springboot/KeystoneComponentConfiguration.java
index 3168db9..0712bca 100644
--- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/keystone/springboot/KeystoneComponentConfiguration.java
+++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/keystone/springboot/KeystoneComponentConfiguration.java
@@ -53,15 +53,6 @@ public class KeystoneComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class KeystoneComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/neutron/springboot/NeutronComponentConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/neutron/springboot/NeutronComponentConfiguration.java
index 496c933..e851871 100644
--- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/neutron/springboot/NeutronComponentConfiguration.java
+++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/neutron/springboot/NeutronComponentConfiguration.java
@@ -53,15 +53,6 @@ public class NeutronComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class NeutronComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/nova/springboot/NovaComponentConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/nova/springboot/NovaComponentConfiguration.java
index e11a1b6..4dc1f63 100644
--- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/nova/springboot/NovaComponentConfiguration.java
+++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/nova/springboot/NovaComponentConfiguration.java
@@ -53,15 +53,6 @@ public class NovaComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class NovaComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/swift/springboot/SwiftComponentConfiguration.java b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/swift/springboot/SwiftComponentConfiguration.java
index ad542d3..113855a 100644
--- a/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/swift/springboot/SwiftComponentConfiguration.java
+++ b/components-starter/camel-openstack-starter/src/main/java/org/apache/camel/component/openstack/swift/springboot/SwiftComponentConfiguration.java
@@ -53,15 +53,6 @@ public class SwiftComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class SwiftComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentConfiguration.java b/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentConfiguration.java
index 1e1e45b..eb772dd 100644
--- a/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentConfiguration.java
+++ b/components-starter/camel-pdf-starter/src/main/java/org/apache/camel/component/pdf/springboot/PdfComponentConfiguration.java
@@ -53,15 +53,6 @@ public class PdfComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class PdfComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-pg-replication-slot-starter/src/main/java/org/apache/camel/component/pg/replication/slot/springboot/PgReplicationSlotComponentConfiguration.java b/components-starter/camel-pg-replication-slot-starter/src/main/java/org/apache/camel/component/pg/replication/slot/springboot/PgReplicationSlotComponentConfiguration.java
index 98eb66a..6924462 100644
--- a/components-starter/camel-pg-replication-slot-starter/src/main/java/org/apache/camel/component/pg/replication/slot/springboot/PgReplicationSlotComponentConfiguration.java
+++ b/components-starter/camel-pg-replication-slot-starter/src/main/java/org/apache/camel/component/pg/replication/slot/springboot/PgReplicationSlotComponentConfiguration.java
@@ -42,17 +42,6 @@ public class PgReplicationSlotComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -70,14 +59,6 @@ public class PgReplicationSlotComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConfiguration.java b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConfiguration.java
index b3ab646..e887d27 100644
--- a/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConfiguration.java
+++ b/components-starter/camel-platform-http-starter/src/main/java/org/apache/camel/component/platform/http/springboot/PlatformHttpComponentConfiguration.java
@@ -42,17 +42,6 @@ public class PlatformHttpComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -70,14 +59,6 @@ public class PlatformHttpComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-printer-starter/src/main/java/org/apache/camel/component/printer/springboot/PrinterComponentConfiguration.java b/components-starter/camel-printer-starter/src/main/java/org/apache/camel/component/printer/springboot/PrinterComponentConfiguration.java
index 50b3a26..a709716 100644
--- a/components-starter/camel-printer-starter/src/main/java/org/apache/camel/component/printer/springboot/PrinterComponentConfiguration.java
+++ b/components-starter/camel-printer-starter/src/main/java/org/apache/camel/component/printer/springboot/PrinterComponentConfiguration.java
@@ -52,15 +52,6 @@ public class PrinterComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class PrinterComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
index 4a2ec3b..c46f16e 100644
--- a/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
+++ b/components-starter/camel-quartz-starter/src/main/java/org/apache/camel/component/quartz/springboot/QuartzComponentConfiguration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.quartz.springboot;
 
+import java.util.Map;
 import javax.annotation.Generated;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -56,10 +57,14 @@ public class QuartzComponentConfiguration
      */
     private Boolean enableJmx = true;
     /**
-     * Properties to configure the Quartz scheduler. The option is a
-     * java.util.Properties type.
+     * References to an existing Properties or Map to lookup in the registry to
+     * use for configuring quartz.
      */
-    private String properties;
+    private String propertiesRef;
+    /**
+     * Properties to configure the Quartz scheduler.
+     */
+    private Map properties;
     /**
      * File name of the properties to load from the classpath
      */
@@ -94,17 +99,6 @@ public class QuartzComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -147,11 +141,19 @@ public class QuartzComponentConfiguration
         this.enableJmx = enableJmx;
     }
 
-    public String getProperties() {
+    public String getPropertiesRef() {
+        return propertiesRef;
+    }
+
+    public void setPropertiesRef(String propertiesRef) {
+        this.propertiesRef = propertiesRef;
+    }
+
+    public Map getProperties() {
         return properties;
     }
 
-    public void setProperties(String properties) {
+    public void setProperties(Map properties) {
         this.properties = properties;
     }
 
@@ -203,14 +205,6 @@ public class QuartzComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentConfiguration.java b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentConfiguration.java
index 5efa84f..dd0e0e9 100644
--- a/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentConfiguration.java
+++ b/components-starter/camel-rest-starter/src/main/java/org/apache/camel/component/rest/springboot/RestApiComponentConfiguration.java
@@ -43,17 +43,6 @@ public class RestApiComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -71,14 +60,6 @@ public class RestApiComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-rest-swagger-starter/pom.xml b/components-starter/camel-rest-swagger-starter/pom.xml
index 511ed38..148f080 100644
--- a/components-starter/camel-rest-swagger-starter/pom.xml
+++ b/components-starter/camel-rest-swagger-starter/pom.xml
@@ -38,6 +38,14 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-rest-swagger</artifactId>
       <version>${camel-version}</version>
+      <!--START OF GENERATED CODE-->
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
+      <!--END OF GENERATED CODE-->
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>
diff --git a/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java b/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java
index 938934d..ee66efd 100644
--- a/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java
+++ b/components-starter/camel-rest-swagger-starter/src/main/java/org/apache/camel/component/rest/swagger/springboot/RestSwaggerComponentConfiguration.java
@@ -112,15 +112,6 @@ public class RestSwaggerComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getBasePath() {
         return basePath;
@@ -202,12 +193,4 @@ public class RestSwaggerComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentConfiguration.java b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentConfiguration.java
index 4209a16..da68878 100644
--- a/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentConfiguration.java
+++ b/components-starter/camel-rss-starter/src/main/java/org/apache/camel/component/rss/springboot/RssComponentConfiguration.java
@@ -42,17 +42,6 @@ public class RssComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -70,14 +59,6 @@ public class RssComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-saga-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentConfiguration.java b/components-starter/camel-saga-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentConfiguration.java
index b8d1656..e7b6809 100644
--- a/components-starter/camel-saga-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentConfiguration.java
+++ b/components-starter/camel-saga-starter/src/main/java/org/apache/camel/component/saga/springboot/SagaComponentConfiguration.java
@@ -53,15 +53,6 @@ public class SagaComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class SagaComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
index ef1519c..0b2e3c0 100644
--- a/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
+++ b/components-starter/camel-salesforce-starter/src/main/java/org/apache/camel/component/salesforce/springboot/SalesforceComponentConfiguration.java
@@ -207,7 +207,7 @@ public class SalesforceComponentConfiguration
     private String httpProxyRealm;
     /**
      * If set to true Digest authentication will be used when authenticating to
-     * the HTTP proxy,otherwise Basic authorization method will be used
+     * the HTTP proxy, otherwise Basic authorization method will be used
      */
     private Boolean httpProxyUseDigestAuth = false;
     /**
diff --git a/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentConfiguration.java b/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentConfiguration.java
index a80f421..9b6a2a7 100644
--- a/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentConfiguration.java
+++ b/components-starter/camel-sap-netweaver-starter/src/main/java/org/apache/camel/component/sap/netweaver/springboot/NetWeaverComponentConfiguration.java
@@ -53,15 +53,6 @@ public class NetWeaverComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class NetWeaverComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-scheduler-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentConfiguration.java b/components-starter/camel-scheduler-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentConfiguration.java
index ba3bc6d..b9722e7 100644
--- a/components-starter/camel-scheduler-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentConfiguration.java
+++ b/components-starter/camel-scheduler-starter/src/main/java/org/apache/camel/component/scheduler/springboot/SchedulerComponentConfiguration.java
@@ -48,17 +48,6 @@ public class SchedulerComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -84,14 +73,6 @@ public class SchedulerComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentConfiguration.java b/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentConfiguration.java
index 7bba3c2..0c0bdba 100644
--- a/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentConfiguration.java
+++ b/components-starter/camel-schematron-starter/src/main/java/org/apache/camel/component/schematron/springboot/SchematronComponentConfiguration.java
@@ -52,15 +52,6 @@ public class SchematronComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class SchematronComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConfiguration.java b/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConfiguration.java
index 4ec26dd..eba9403 100644
--- a/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConfiguration.java
+++ b/components-starter/camel-seda-starter/src/main/java/org/apache/camel/component/seda/springboot/SedaComponentConfiguration.java
@@ -60,6 +60,13 @@ public class SedaComponentConfiguration
      */
     private Boolean defaultBlockWhenFull = false;
     /**
+     * Whether a thread that sends messages to a full SEDA queue will be
+     * discarded. By default, an exception will be thrown stating that the queue
+     * is full. By enabling this option, the calling thread will give up sending
+     * and continue, meaning that the message was not sent to the SEDA queue.
+     */
+    private Boolean defaultDiscardWhenFull = false;
+    /**
      * Whether a thread that sends messages to a full SEDA queue will block
      * until the queue's capacity is no longer exhausted. By default, an
      * exception will be thrown stating that the queue is full. By enabling this
@@ -125,6 +132,14 @@ public class SedaComponentConfiguration
         this.defaultBlockWhenFull = defaultBlockWhenFull;
     }
 
+    public Boolean getDefaultDiscardWhenFull() {
+        return defaultDiscardWhenFull;
+    }
+
+    public void setDefaultDiscardWhenFull(Boolean defaultDiscardWhenFull) {
+        this.defaultDiscardWhenFull = defaultDiscardWhenFull;
+    }
+
     public Long getDefaultOfferTimeout() {
         return defaultOfferTimeout;
     }
diff --git a/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java b/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java
index 8a4236c..77acc07 100644
--- a/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java
+++ b/components-starter/camel-service-starter/src/main/java/org/apache/camel/component/service/springboot/ServiceComponentConfiguration.java
@@ -53,17 +53,6 @@ public class ServiceComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -97,14 +86,6 @@ public class ServiceComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConfiguration.java b/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConfiguration.java
index 336957f..b84521c 100644
--- a/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConfiguration.java
+++ b/components-starter/camel-servicenow-starter/src/main/java/org/apache/camel/component/servicenow/springboot/ServiceNowComponentConfiguration.java
@@ -111,15 +111,6 @@ public class ServiceNowComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getInstanceName() {
         return instanceName;
@@ -243,14 +234,6 @@ public class ServiceNowComponentConfiguration
         this.lazyStartProducer = lazyStartProducer;
     }
 
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
-
     public static class ServiceNowConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.servicenow.ServiceNowConfiguration.class;
         /**
diff --git a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
index ac1c3f2..feeae91 100644
--- a/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
+++ b/components-starter/camel-servlet-starter/src/main/java/org/apache/camel/component/servlet/springboot/ServletComponentConfiguration.java
@@ -91,17 +91,6 @@ public class ServletComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -183,14 +172,6 @@ public class ServletComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentConfiguration.java b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentConfiguration.java
index 1fe658b..4fec195 100644
--- a/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentConfiguration.java
+++ b/components-starter/camel-sjms-starter/src/main/java/org/apache/camel/component/sjms/batch/springboot/SjmsBatchComponentConfiguration.java
@@ -73,17 +73,6 @@ public class SjmsBatchComponentConfiguration
      */
     private Boolean basicPropertyBinding = false;
     /**
-     * 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.
-     */
-    private Boolean lazyStartProducer = false;
-    /**
      * 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
@@ -133,14 +122,6 @@ public class SjmsBatchComponentConfiguration
         this.basicPropertyBinding = basicPropertyBinding;
     }
 
-    public Boolean getLazyStartProducer() {
-        return lazyStartProducer;
-    }
-
-    public void setLazyStartProducer(Boolean lazyStartProducer) {
-        this.lazyStartProducer = lazyStartProducer;
-    }
-
     public Boolean getBridgeErrorHandler() {
         return bridgeErrorHandler;
     }
diff --git a/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentConfiguration.java b/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentConfiguration.java
index 46bf7b7..11767be 100644
--- a/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentConfiguration.java
+++ b/components-starter/camel-solr-starter/src/main/java/org/apache/camel/component/solr/springboot/SolrComponentConfiguration.java
@@ -52,15 +52,6 @@ public class SolrComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class SolrComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentConfiguration.java b/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentConfiguration.java
index cf11890..ec671af 100644
--- a/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentConfiguration.java
+++ b/components-starter/camel-spark-starter/src/main/java/org/apache/camel/component/spark/springboot/SparkComponentConfiguration.java
@@ -63,15 +63,6 @@ public class SparkComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getRdd() {
         return rdd;
@@ -104,12 +95,4 @@ public class SparkComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentConfiguration.java b/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentConfiguration.java
index d3c46de..ae03abe 100644
--- a/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentConfiguration.java
+++ b/components-starter/camel-spring-batch-starter/src/main/java/org/apache/camel/component/spring/batch/springboot/SpringBatchComponentConfiguration.java
@@ -63,15 +63,6 @@ public class SpringBatchComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getJobLauncher() {
         return jobLauncher;
@@ -104,12 +95,4 @@ public class SpringBatchComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentConfiguration.java b/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentConfiguration.java
index cb12a7d..23c1f4b 100644
--- a/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentConfiguration.java
+++ b/components-starter/camel-spring-ldap-starter/src/main/java/org/apache/camel/component/springldap/springboot/SpringLdapComponentConfiguration.java
@@ -53,15 +53,6 @@ public class SpringLdapComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class SpringLdapComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentConfiguration.java b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentConfiguration.java
index ec971b0..dea1cdc 100644
--- a/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentConfiguration.java
+++ b/components-starter/camel-sql-starter/src/main/java/org/apache/camel/component/sql/stored/springboot/SqlStoredComponentConfiguration.java
@@ -58,15 +58,6 @@ public class SqlStoredComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public String getDataSource() {
         return dataSource;
@@ -91,12 +82,4 @@ public class SqlStoredComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConfiguration.java b/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConfiguration.java
index 3c72333..7f4b28d 100644
--- a/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConfiguration.java
+++ b/components-starter/camel-ssh-starter/src/main/java/org/apache/camel/component/ssh/springboot/SshComponentConfiguration.java
@@ -20,7 +20,6 @@ import javax.annotation.Generated;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.apache.sshd.common.keyprovider.KeyPairProvider;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.boot.context.properties.DeprecatedConfigurationProperty;
 
 /**
  * The ssh component enables access to SSH servers such that you can send an SSH
@@ -275,8 +274,6 @@ public class SshComponentConfiguration
 
     public static class SshConfigurationNestedConfiguration {
         public static final Class CAMEL_NESTED_CLASS = org.apache.camel.component.ssh.SshConfiguration.class;
-        @Deprecated
-        private String certFilename;
         /**
          * Sets the resource path of the certificate to use for Authentication.
          * Will use ResourceHelperKeyPairProvider to resolve file based
@@ -355,17 +352,6 @@ public class SshComponentConfiguration
          */
         private String username;
 
-        @Deprecated
-        @DeprecatedConfigurationProperty
-        public String getCertFilename() {
-            return certFilename;
-        }
-
-        @Deprecated
-        public void setCertFilename(String certFilename) {
-            this.certFilename = certFilename;
-        }
-
         public String getCertResource() {
             return certResource;
         }
diff --git a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentConfiguration.java b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentConfiguration.java
index 43d0c95..352f9c2 100644
--- a/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentConfiguration.java
+++ b/components-starter/camel-stax-starter/src/main/java/org/apache/camel/component/stax/springboot/StAXComponentConfiguration.java
@@ -53,15 +53,6 @@ public class StAXComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -78,12 +69,4 @@ public class StAXComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java b/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
index a154cc0..dd9f5a1 100644
--- a/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
+++ b/components-starter/camel-stomp-starter/src/main/java/org/apache/camel/component/stomp/springboot/StompComponentConfiguration.java
@@ -16,6 +16,7 @@
  */
 package org.apache.camel.component.stomp.springboot;
 
+import java.util.Properties;
 import javax.annotation.Generated;
 import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
 import org.apache.camel.support.jsse.SSLContextParameters;
@@ -183,6 +184,10 @@ public class StompComponentConfiguration
          */
         private String brokerURL = "tcp://localhost:61613";
         /**
+         * To set custom headers
+         */
+        private Properties customHeaders;
+        /**
          * The virtual host name
          */
         private String host;
@@ -198,6 +203,10 @@ public class StompComponentConfiguration
          * To configure security using SSLContextParameters
          */
         private SSLContextParameters sslContextParameters;
+        /**
+         * The stomp version (1.1, or 1.2)
+         */
+        private String version;
 
         public String getBrokerURL() {
             return brokerURL;
@@ -207,6 +216,14 @@ public class StompComponentConfiguration
             this.brokerURL = brokerURL;
         }
 
+        public Properties getCustomHeaders() {
+            return customHeaders;
+        }
+
+        public void setCustomHeaders(Properties customHeaders) {
+            this.customHeaders = customHeaders;
+        }
+
         public String getHost() {
             return host;
         }
@@ -239,5 +256,13 @@ public class StompComponentConfiguration
                 SSLContextParameters sslContextParameters) {
             this.sslContextParameters = sslContextParameters;
         }
+
+        public String getVersion() {
+            return version;
+        }
+
+        public void setVersion(String version) {
+            this.version = version;
+        }
     }
 }
\ No newline at end of file
diff --git a/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentConfiguration.java b/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentConfiguration.java
index 468f340..0acf1f1 100644
--- a/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentConfiguration.java
+++ b/components-starter/camel-stringtemplate-starter/src/main/java/org/apache/camel/component/stringtemplate/springboot/StringTemplateComponentConfiguration.java
@@ -52,15 +52,6 @@ public class StringTemplateComponentConfiguration
      * and prolong the total processing time of the processing.
      */
     private Boolean lazyStartProducer = false;
-    /**
-     * 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.
-     */
-    private Boolean bridgeErrorHandler = false;
 
     public Boolean getBasicPropertyBinding() {
         return basicPropertyBinding;
@@ -77,12 +68,4 @@ public class StringTemplateComponentConfiguration
     public void setLazyStartProducer(Boolean lazyStartProducer) {
         this.lazyStartProducer = lazyStartProducer;
     }
-
-    public Boolean getBridgeErrorHandler() {
-        return bridgeErrorHandler;
-    }
-
-    public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
-        this.bridgeErrorHandler = bridgeErrorHandler;
-    }
 }
\ No newline at end of file
diff --git a/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConfiguration.java b/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConfiguration.java
index 93d3ff4..d0396e0 100644
--- a/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConfiguration.java
+++ b/components-starter/camel-stub-starter/src/main/java/org/apache/camel/component/stub/springboot/StubComponentConfiguration.java
@@ -60,6 +60,13 @@ public class StubComponentConfiguration
      */
     private Boolean defaultBlockWhenFull = false;
... 3557 lines suppressed ...