You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/11/07 08:25:57 UTC

[camel] branch master updated: Generated configurer special handling for camel-main so we can use them only during bootstrap. Removed need for ALL_OPTIONS in almost all configurers.

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 4e79c5b  Generated configurer special handling for camel-main so we can use them only during bootstrap. Removed need for ALL_OPTIONS in almost all configurers.
4e79c5b is described below

commit 4e79c5bb4621c199ab4065559c9dded2f16883c9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sat Nov 7 09:24:26 2020 +0100

    Generated configurer special handling for camel-main so we can use them only during bootstrap. Removed need for ALL_OPTIONS in almost all configurers.
---
 .../activemq/ActiveMQComponentConfigurer.java      | 119 +----------------
 .../activemq/ActiveMQEndpointConfigurer.java       | 107 +--------------
 .../component/ahc/ws/WsComponentConfigurer.java    |  29 +----
 .../component/ahc/ws/WsEndpointConfigurer.java     |  40 +-----
 .../component/ahc/AhcComponentConfigurer.java      |  28 +---
 .../camel/component/ahc/AhcEndpointConfigurer.java |  35 +----
 .../component/amqp/AMQPComponentConfigurer.java    | 116 +----------------
 .../component/amqp/AMQPEndpointConfigurer.java     | 107 +--------------
 .../component/apns/ApnsComponentConfigurer.java    |  23 +---
 .../component/apns/ApnsEndpointConfigurer.java     |  43 +------
 .../arangodb/ArangoDbComponentConfigurer.java      |  31 +----
 .../arangodb/ArangoDbEndpointConfigurer.java       |  32 +----
 .../as2/AS2ClientManagerEndpointConfiguration.java |   4 +-
 ...ientManagerEndpointConfigurationConfigurer.java |   8 +-
 .../component/as2/AS2ComponentConfigurer.java      |  23 +---
 .../component/as2/AS2ConfigurationConfigurer.java  |   8 +-
 .../camel/component/as2/AS2EndpointConfigurer.java |  53 +-------
 .../as2/AS2ServerManagerEndpointConfiguration.java |   4 +-
 ...rverManagerEndpointConfigurationConfigurer.java |   8 +-
 .../camel/component/as2/AS2Configuration.java      |   2 +-
 .../asterisk/AsteriskComponentConfigurer.java      |  22 +---
 .../asterisk/AsteriskEndpointConfigurer.java       |  30 +----
 .../atlasmap/AtlasMapComponentConfigurer.java      |  22 +---
 .../atlasmap/AtlasMapEndpointConfigurer.java       |  29 +----
 .../component/atmos/AtmosComponentConfigurer.java  |  26 +---
 .../component/atmos/AtmosEndpointConfigurer.java   |  35 +----
 .../websocket/WebsocketComponentConfigurer.java    |  30 +----
 .../websocket/WebsocketEndpointConfigurer.java     |  48 +------
 .../component/atom/AtomComponentConfigurer.java    |  21 +--
 .../component/atom/AtomEndpointConfigurer.java     |  49 +------
 .../client/map/AtomixMapComponentConfigurer.java   |  37 +-----
 .../client/map/AtomixMapEndpointConfigurer.java    |  40 +-----
 .../AtomixMessagingComponentConfigurer.java        |  38 +-----
 .../AtomixMessagingEndpointConfigurer.java         |  41 +-----
 .../AtomixMultiMapComponentConfigurer.java         |  36 +-----
 .../multimap/AtomixMultiMapEndpointConfigurer.java |  37 +-----
 .../queue/AtomixQueueComponentConfigurer.java      |  35 +----
 .../queue/AtomixQueueEndpointConfigurer.java       |  38 +-----
 .../client/set/AtomixSetComponentConfigurer.java   |  36 +-----
 .../client/set/AtomixSetEndpointConfigurer.java    |  39 +-----
 .../value/AtomixValueComponentConfigurer.java      |  36 +-----
 .../value/AtomixValueEndpointConfigurer.java       |  39 +-----
 .../component/avro/AvroComponentConfigurer.java    |  29 +----
 .../component/avro/AvroEndpointConfigurer.java     |  35 +----
 .../component/aws/cw/CwComponentConfigurer.java    |  34 +----
 .../component/aws/cw/CwEndpointConfigurer.java     |  35 +----
 .../component/aws/ddb/DdbComponentConfigurer.java  |  36 +-----
 .../component/aws/ddb/DdbEndpointConfigurer.java   |  37 +-----
 .../ddbstream/DdbStreamComponentConfigurer.java    |  33 +----
 .../aws/ddbstream/DdbStreamEndpointConfigurer.java |  52 +-------
 .../component/aws/ec2/EC2ComponentConfigurer.java  |  31 +----
 .../component/aws/ec2/EC2EndpointConfigurer.java   |  32 +----
 .../component/aws/ecs/ECSComponentConfigurer.java  |  31 +----
 .../component/aws/ecs/ECSEndpointConfigurer.java   |  32 +----
 .../component/aws/eks/EKSComponentConfigurer.java  |  31 +----
 .../component/aws/eks/EKSEndpointConfigurer.java   |  32 +----
 .../component/aws/iam/IAMComponentConfigurer.java  |  31 +----
 .../component/aws/iam/IAMEndpointConfigurer.java   |  32 +----
 .../KinesisFirehoseComponentConfigurer.java        |  30 +----
 .../KinesisFirehoseEndpointConfigurer.java         |  31 +----
 .../aws/kinesis/KinesisComponentConfigurer.java    |  36 +-----
 .../aws/kinesis/KinesisEndpointConfigurer.java     |  55 +-------
 .../component/aws/kms/KMSComponentConfigurer.java  |  31 +----
 .../component/aws/kms/KMSEndpointConfigurer.java   |  32 +----
 .../aws/lambda/LambdaComponentConfigurer.java      |  31 +----
 .../aws/lambda/LambdaEndpointConfigurer.java       |  32 +----
 .../component/aws/mq/MQComponentConfigurer.java    |  31 +----
 .../component/aws/mq/MQEndpointConfigurer.java     |  32 +----
 .../component/aws/msk/MSKComponentConfigurer.java  |  31 +----
 .../component/aws/msk/MSKEndpointConfigurer.java   |  32 +----
 .../component/aws/s3/S3ComponentConfigurer.java    |  58 +--------
 .../component/aws/s3/S3EndpointConfigurer.java     |  79 +-----------
 .../component/aws/sdb/SdbComponentConfigurer.java  |  21 +--
 .../component/aws/sdb/SdbEndpointConfigurer.java   |  33 +----
 .../component/aws/ses/SesComponentConfigurer.java  |  34 +----
 .../component/aws/ses/SesEndpointConfigurer.java   |  35 +----
 .../component/aws/sns/SnsComponentConfigurer.java  |  39 +-----
 .../component/aws/sns/SnsEndpointConfigurer.java   |  41 +-----
 .../component/aws/sqs/SqsComponentConfigurer.java  |  58 +--------
 .../component/aws/sqs/SqsEndpointConfigurer.java   |  79 +-----------
 .../component/aws/swf/SWFComponentConfigurer.java  |  49 +------
 .../component/aws/swf/SWFEndpointConfigurer.java   |  52 +-------
 .../translate/TranslateComponentConfigurer.java    |  34 +----
 .../aws/translate/TranslateEndpointConfigurer.java |  35 +----
 .../aws2/athena/Athena2ComponentConfigurer.java    |  49 +------
 .../aws2/athena/Athena2EndpointConfigurer.java     |  50 +------
 .../component/aws2/cw/Cw2ComponentConfigurer.java  |  35 +----
 .../component/aws2/cw/Cw2EndpointConfigurer.java   |  36 +-----
 .../aws2/ddb/Ddb2ComponentConfigurer.java          |  37 +-----
 .../component/aws2/ddb/Ddb2EndpointConfigurer.java |  38 +-----
 .../ddbstream/Ddb2StreamComponentConfigurer.java   |  34 +----
 .../ddbstream/Ddb2StreamEndpointConfigurer.java    |  53 +-------
 .../aws2/ec2/AWS2EC2ComponentConfigurer.java       |  33 +----
 .../aws2/ec2/AWS2EC2EndpointConfigurer.java        |  34 +----
 .../aws2/ecs/ECS2ComponentConfigurer.java          |  33 +----
 .../component/aws2/ecs/ECS2EndpointConfigurer.java |  34 +----
 .../aws2/eks/EKS2ComponentConfigurer.java          |  33 +----
 .../component/aws2/eks/EKS2EndpointConfigurer.java |  34 +----
 .../EventbridgeComponentConfigurer.java            |  34 +----
 .../eventbridge/EventbridgeEndpointConfigurer.java |  35 +----
 .../aws2/iam/IAM2ComponentConfigurer.java          |  33 +----
 .../component/aws2/iam/IAM2EndpointConfigurer.java |  34 +----
 .../KinesisFirehose2ComponentConfigurer.java       |  33 +----
 .../KinesisFirehose2EndpointConfigurer.java        |  34 +----
 .../aws2/kinesis/Kinesis2ComponentConfigurer.java  |  38 +-----
 .../aws2/kinesis/Kinesis2EndpointConfigurer.java   |  57 +-------
 .../aws2/kms/KMS2ComponentConfigurer.java          |  33 +----
 .../component/aws2/kms/KMS2EndpointConfigurer.java |  34 +----
 .../aws2/lambda/Lambda2ComponentConfigurer.java    |  33 +----
 .../aws2/lambda/Lambda2EndpointConfigurer.java     |  34 +----
 .../component/aws2/mq/MQ2ComponentConfigurer.java  |  33 +----
 .../component/aws2/mq/MQ2EndpointConfigurer.java   |  34 +----
 .../aws2/msk/MSK2ComponentConfigurer.java          |  33 +----
 .../component/aws2/msk/MSK2EndpointConfigurer.java |  34 +----
 .../aws2/s3/AWS2S3ComponentConfigurer.java         |  61 +--------
 .../aws2/s3/AWS2S3EndpointConfigurer.java          |  82 +-----------
 .../aws2/ses/Ses2ComponentConfigurer.java          |  35 +----
 .../component/aws2/ses/Ses2EndpointConfigurer.java |  36 +-----
 .../aws2/sns/Sns2ComponentConfigurer.java          |  39 +-----
 .../component/aws2/sns/Sns2EndpointConfigurer.java |  41 +-----
 .../aws2/sqs/Sqs2ComponentConfigurer.java          |  60 +--------
 .../component/aws2/sqs/Sqs2EndpointConfigurer.java |  81 +-----------
 .../aws2/sts/STS2ComponentConfigurer.java          |  33 +----
 .../component/aws2/sts/STS2EndpointConfigurer.java |  34 +----
 .../translate/Translate2ComponentConfigurer.java   |  36 +-----
 .../translate/Translate2EndpointConfigurer.java    |  37 +-----
 .../eventhubs/EventHubsComponentConfigurer.java    |  40 +-----
 .../eventhubs/EventHubsEndpointConfigurer.java     |  44 +------
 .../storage/blob/BlobComponentConfigurer.java      |  47 +------
 .../azure/storage/blob/BlobEndpointConfigurer.java |  52 +-------
 .../storage/queue/QueueComponentConfigurer.java    |  35 +----
 .../storage/queue/QueueEndpointConfigurer.java     |  39 +-----
 .../azure/blob/BlobServiceComponentConfigurer.java |  41 +-----
 .../azure/blob/BlobServiceEndpointConfigurer.java  |  44 +------
 .../queue/QueueServiceComponentConfigurer.java     |  32 +----
 .../queue/QueueServiceEndpointConfigurer.java      |  35 +----
 .../BeanValidatorComponentConfigurer.java          |  27 +---
 .../validator/BeanValidatorEndpointConfigurer.java |  30 +----
 .../component/bean/BeanComponentConfigurer.java    |  23 +---
 .../component/bean/BeanEndpointConfigurer.java     |  27 +---
 .../beanclass/ClassComponentConfigurer.java        |  14 +-
 .../beanclass/ClassEndpointConfigurer.java         |  18 +--
 .../beanstalk/BeanstalkComponentConfigurer.java    |  23 +---
 .../beanstalk/BeanstalkEndpointConfigurer.java     |  49 +------
 .../bonita/BonitaComponentConfigurer.java          |  21 +--
 .../component/bonita/BonitaEndpointConfigurer.java |  28 +---
 ...CollaborationsManagerEndpointConfiguration.java |   4 +-
 ...ionsManagerEndpointConfigurationConfigurer.java |   8 +-
 .../BoxCommentsManagerEndpointConfiguration.java   |   4 +-
 ...entsManagerEndpointConfigurationConfigurer.java |   8 +-
 .../component/box/BoxComponentConfigurer.java      |  38 +-----
 .../component/box/BoxConfigurationConfigurer.java  |   8 +-
 .../camel/component/box/BoxEndpointConfigurer.java |  42 +-----
 .../BoxEventLogsManagerEndpointConfiguration.java  |   4 +-
 ...LogsManagerEndpointConfigurationConfigurer.java |   8 +-
 .../box/BoxEventsManagerEndpointConfiguration.java |   4 +-
 ...entsManagerEndpointConfigurationConfigurer.java |   8 +-
 .../box/BoxFilesManagerEndpointConfiguration.java  |   4 +-
 ...ilesManagerEndpointConfigurationConfigurer.java |   8 +-
 .../BoxFoldersManagerEndpointConfiguration.java    |   4 +-
 ...dersManagerEndpointConfigurationConfigurer.java |   8 +-
 .../box/BoxGroupsManagerEndpointConfiguration.java |   4 +-
 ...oupsManagerEndpointConfigurationConfigurer.java |   8 +-
 .../box/BoxSearchManagerEndpointConfiguration.java |   4 +-
 ...archManagerEndpointConfigurationConfigurer.java |   8 +-
 .../box/BoxTasksManagerEndpointConfiguration.java  |   4 +-
 ...asksManagerEndpointConfigurationConfigurer.java |   8 +-
 .../box/BoxUsersManagerEndpointConfiguration.java  |   4 +-
 ...sersManagerEndpointConfigurationConfigurer.java |   8 +-
 .../camel/component/box/BoxConfiguration.java      |   2 +-
 .../AddOnGatewayEndpointConfiguration.java         |   4 +-
 ...ddOnGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../AddressGatewayEndpointConfiguration.java       |   4 +-
 ...ressGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../braintree/BraintreeComponentConfigurer.java    |  22 +---
 .../BraintreeConfigurationConfigurer.java          |   8 +-
 .../braintree/BraintreeEndpointConfigurer.java     |  36 +-----
 .../ClientTokenGatewayEndpointConfiguration.java   |   4 +-
 ...okenGatewayEndpointConfigurationConfigurer.java |   8 +-
 ...rdVerificationGatewayEndpointConfiguration.java |   4 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../CustomerGatewayEndpointConfiguration.java      |   4 +-
 ...omerGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../DiscountGatewayEndpointConfiguration.java      |   4 +-
 ...ountGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../DisputeGatewayEndpointConfiguration.java       |   4 +-
 ...puteGatewayEndpointConfigurationConfigurer.java |   8 +-
 ...DocumentUploadGatewayEndpointConfiguration.java |   4 +-
 ...loadGatewayEndpointConfigurationConfigurer.java |   8 +-
 ...erchantAccountGatewayEndpointConfiguration.java |   4 +-
 ...ountGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../PaymentMethodGatewayEndpointConfiguration.java |   4 +-
 ...thodGatewayEndpointConfigurationConfigurer.java |   8 +-
 ...entMethodNonceGatewayEndpointConfiguration.java |   4 +-
 ...onceGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../PlanGatewayEndpointConfiguration.java          |   4 +-
 ...PlanGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../ReportGatewayEndpointConfiguration.java        |   4 +-
 ...portGatewayEndpointConfigurationConfigurer.java |   8 +-
 ...ntBatchSummaryGatewayEndpointConfiguration.java |   4 +-
 ...maryGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../SubscriptionGatewayEndpointConfiguration.java  |   4 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../TransactionGatewayEndpointConfiguration.java   |   4 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |   8 +-
 ...okNotificationGatewayEndpointConfiguration.java |   4 +-
 ...tionGatewayEndpointConfigurationConfigurer.java |   8 +-
 .../braintree/BraintreeConfiguration.java          |   2 +-
 .../browse/BrowseComponentConfigurer.java          |  22 +---
 .../component/browse/BrowseEndpointConfigurer.java |  26 +---
 .../cache/CaffeineCacheComponentConfigurer.java    |  36 +-----
 .../cache/CaffeineCacheEndpointConfigurer.java     |  37 +-----
 .../load/CaffeineLoadCacheComponentConfigurer.java |  36 +-----
 .../load/CaffeineLoadCacheEndpointConfigurer.java  |  37 +-----
 .../cassandra/CassandraComponentConfigurer.java    |  22 +---
 .../cassandra/CassandraEndpointConfigurer.java     |  55 +-------
 .../chatscript/ChatScriptComponentConfigurer.java  |  21 +--
 .../chatscript/ChatScriptEndpointConfigurer.java   |  27 +---
 .../component/chunk/ChunkComponentConfigurer.java  |  23 +---
 .../component/chunk/ChunkEndpointConfigurer.java   |  31 +----
 .../camel/component/cm/CMComponentConfigurer.java  |  21 +--
 .../camel/component/cm/CMEndpointConfigurer.java   |  27 +---
 .../component/cmis/CMISComponentConfigurer.java    |  23 +---
 .../component/cmis/CMISEndpointConfigurer.java     |  35 +----
 .../apache/camel/coap/CoAPComponentConfigurer.java |  22 +---
 .../apache/camel/coap/CoAPEndpointConfigurer.java  |  36 +-----
 .../cometd/CometdComponentConfigurer.java          |  29 +----
 .../component/cometd/CometdEndpointConfigurer.java |  40 +-----
 .../consul/ConsulComponentConfigurer.java          |  48 +------
 .../component/consul/ConsulEndpointConfigurer.java |  50 +------
 .../controlbus/ControlBusComponentConfigurer.java  |  21 +--
 .../controlbus/ControlBusEndpointConfigurer.java   |  29 +----
 .../component/corda/CordaComponentConfigurer.java  |  33 +----
 .../component/corda/CordaEndpointConfigurer.java   |  36 +-----
 .../couchbase/CouchbaseComponentConfigurer.java    |  22 +---
 .../couchbase/CouchbaseEndpointConfigurer.java     |  67 +---------
 .../couchdb/CouchDbComponentConfigurer.java        |  22 +---
 .../couchdb/CouchDbEndpointConfigurer.java         |  37 +-----
 .../component/cron/CronComponentConfigurer.java    |  22 +---
 .../component/cron/CronEndpointConfigurer.java     |  26 +---
 .../crypto/cms/CryptoCmsComponentConfigurer.java   |  23 +---
 .../crypto/cms/CryptoCmsEndpointConfigurer.java    |  38 +-----
 .../DigitalSignatureComponentConfigurer.java       |  40 +-----
 .../crypto/DigitalSignatureEndpointConfigurer.java |  42 +-----
 .../component/cxf/CxfComponentConfigurer.java      |  25 +---
 .../camel/component/cxf/CxfEndpointConfigurer.java |  57 +-------
 .../cxf/jaxrs/CxfRsComponentConfigurer.java        |  24 +---
 .../cxf/jaxrs/CxfRsEndpointConfigurer.java         |  53 +-------
 .../dataformat/DataFormatComponentConfigurer.java  |  21 +--
 .../dataformat/DataFormatEndpointConfigurer.java   |  24 +---
 .../dataset/DataSetComponentConfigurer.java        |  22 +---
 .../dataset/DataSetEndpointConfigurer.java         |  42 +-----
 .../dataset/DataSetTestComponentConfigurer.java    |  21 +--
 .../dataset/DataSetTestEndpointConfigurer.java     |  37 +-----
 .../DebeziumMongodbComponentConfigurer.java        |  73 +----------
 .../DebeziumMongodbEndpointConfigurer.java         |  76 +----------
 .../debezium/DebeziumMySqlComponentConfigurer.java |  98 +-------------
 .../debezium/DebeziumMySqlEndpointConfigurer.java  | 101 +--------------
 .../DebeziumPostgresComponentConfigurer.java       | 103 +--------------
 .../DebeziumPostgresEndpointConfigurer.java        | 106 +--------------
 .../DebeziumSqlserverComponentConfigurer.java      |  83 +-----------
 .../DebeziumSqlserverEndpointConfigurer.java       |  86 +------------
 .../DigitalOceanComponentConfigurer.java           |  21 +--
 .../DigitalOceanEndpointConfigurer.java            |  32 +----
 .../direct/DirectComponentConfigurer.java          |  24 +---
 .../component/direct/DirectEndpointConfigurer.java |  29 +----
 .../directvm/DirectVmComponentConfigurer.java      |  26 +---
 .../directvm/DirectVmEndpointConfigurer.java       |  31 +----
 .../disruptor/DisruptorComponentConfigurer.java    |  28 +---
 .../disruptor/DisruptorEndpointConfigurer.java     |  34 +----
 .../component/djl/DJLComponentConfigurer.java      |  21 +--
 .../camel/component/djl/DJLEndpointConfigurer.java |  26 +---
 .../component/dns/DnsComponentConfigurer.java      |  21 +--
 .../camel/component/dns/DnsEndpointConfigurer.java |  23 +---
 .../docker/DockerComponentConfigurer.java          |  40 +-----
 .../component/docker/DockerEndpointConfigurer.java |  43 +------
 .../component/dozer/DozerComponentConfigurer.java  |  21 +--
 .../component/dozer/DozerEndpointConfigurer.java   |  29 +----
 .../component/drill/DrillComponentConfigurer.java  |  21 +--
 .../component/drill/DrillEndpointConfigurer.java   |  27 +---
 .../dropbox/DropboxComponentConfigurer.java        |  22 +---
 .../dropbox/DropboxEndpointConfigurer.java         |  34 +----
 .../ehcache/EhcacheComponentConfigurer.java        |  35 +----
 .../ehcache/EhcacheEndpointConfigurer.java         |  39 +-----
 .../ElasticsearchComponentConfigurer.java          |  32 +----
 .../ElasticsearchEndpointConfigurer.java           |  39 +-----
 .../component/elsql/ElsqlComponentConfigurer.java  |  26 +---
 .../component/elsql/ElsqlEndpointConfigurer.java   |  71 +---------
 .../etcd/EtcdKeysComponentConfigurer.java          |  31 +----
 .../component/etcd/EtcdKeysEndpointConfigurer.java |  31 +----
 .../etcd/EtcdStatsComponentConfigurer.java         |  34 +----
 .../etcd/EtcdStatsEndpointConfigurer.java          |  52 +-------
 .../etcd/EtcdWatchComponentConfigurer.java         |  32 +----
 .../etcd/EtcdWatchEndpointConfigurer.java          |  34 +----
 .../component/exec/ExecComponentConfigurer.java    |  21 +--
 .../component/exec/ExecEndpointConfigurer.java     |  31 +----
 .../facebook/FacebookComponentConfigurer.java      |  50 +------
 .../facebook/FacebookEndpointConfigurer.java       | 124 +-----------------
 .../FhirCapabilitiesEndpointConfiguration.java     |   4 +-
 ...apabilitiesEndpointConfigurationConfigurer.java |   8 +-
 .../component/fhir/FhirComponentConfigurer.java    |  46 +------
 .../fhir/FhirConfigurationConfigurer.java          |   8 +-
 .../fhir/FhirCreateEndpointConfiguration.java      |   4 +-
 .../FhirCreateEndpointConfigurationConfigurer.java |   8 +-
 .../fhir/FhirDeleteEndpointConfiguration.java      |   4 +-
 .../FhirDeleteEndpointConfigurationConfigurer.java |   8 +-
 .../component/fhir/FhirEndpointConfigurer.java     |  67 +---------
 .../fhir/FhirHistoryEndpointConfiguration.java     |   4 +-
 ...FhirHistoryEndpointConfigurationConfigurer.java |   8 +-
 .../fhir/FhirLoadPageEndpointConfiguration.java    |   4 +-
 ...hirLoadPageEndpointConfigurationConfigurer.java |   8 +-
 .../fhir/FhirMetaEndpointConfiguration.java        |   4 +-
 .../FhirMetaEndpointConfigurationConfigurer.java   |   8 +-
 .../fhir/FhirOperationEndpointConfiguration.java   |   4 +-
 ...irOperationEndpointConfigurationConfigurer.java |   8 +-
 .../fhir/FhirPatchEndpointConfiguration.java       |   4 +-
 .../FhirPatchEndpointConfigurationConfigurer.java  |   8 +-
 .../fhir/FhirReadEndpointConfiguration.java        |   4 +-
 .../FhirReadEndpointConfigurationConfigurer.java   |   8 +-
 .../fhir/FhirSearchEndpointConfiguration.java      |   4 +-
 .../FhirSearchEndpointConfigurationConfigurer.java |   8 +-
 .../fhir/FhirTransactionEndpointConfiguration.java |   4 +-
 ...TransactionEndpointConfigurationConfigurer.java |   8 +-
 .../fhir/FhirUpdateEndpointConfiguration.java      |   4 +-
 .../FhirUpdateEndpointConfigurationConfigurer.java |   8 +-
 .../fhir/FhirValidateEndpointConfiguration.java    |   4 +-
 ...hirValidateEndpointConfigurationConfigurer.java |   8 +-
 .../camel/component/fhir/FhirConfiguration.java    |   2 +-
 .../file/watch/FileWatchComponentConfigurer.java   |  26 +---
 .../file/watch/FileWatchEndpointConfigurer.java    |  34 +----
 .../component/file/FileComponentConfigurer.java    |  22 +---
 .../component/file/FileEndpointConfigurer.java     | 112 +---------------
 .../flatpack/FlatpackComponentConfigurer.java      |  22 +---
 .../flatpack/FlatpackEndpointConfigurer.java       |  49 +------
 .../component/flink/FlinkComponentConfigurer.java  |  24 +---
 .../component/flink/FlinkEndpointConfigurer.java   |  28 +---
 .../component/fop/FopComponentConfigurer.java      |  21 +--
 .../camel/component/fop/FopEndpointConfigurer.java |  25 +---
 .../freemarker/FreemarkerComponentConfigurer.java  |  24 +---
 .../freemarker/FreemarkerEndpointConfigurer.java   |  29 +----
 .../file/remote/FtpComponentConfigurer.java        |  22 +---
 .../file/remote/FtpEndpointConfigurer.java         | 132 +------------------
 .../file/remote/FtpsComponentConfigurer.java       |  23 +---
 .../file/remote/FtpsEndpointConfigurer.java        | 140 +-------------------
 .../file/remote/SftpComponentConfigurer.java       |  22 +---
 .../file/remote/SftpEndpointConfigurer.java        | 143 +--------------------
 .../ganglia/GangliaComponentConfigurer.java        |  34 +----
 .../ganglia/GangliaEndpointConfigurer.java         |  36 +-----
 .../geocoder/GeoCoderComponentConfigurer.java      |  22 +---
 .../geocoder/GeoCoderEndpointConfigurer.java       |  38 +-----
 .../component/git/GitComponentConfigurer.java      |  22 +---
 .../camel/component/git/GitEndpointConfigurer.java |  35 +----
 .../github/GitHubComponentConfigurer.java          |  22 +---
 .../component/github/GitHubEndpointConfigurer.java |  35 +----
 .../GoogleBigQueryComponentConfigurer.java         |  24 +---
 .../bigquery/GoogleBigQueryEndpointConfigurer.java |  27 +---
 .../sql/GoogleBigQuerySQLComponentConfigurer.java  |  23 +---
 .../sql/GoogleBigQuerySQLEndpointConfigurer.java   |  25 +---
 .../calendar/CalendarAclEndpointConfiguration.java |   4 +-
 ...CalendarAclEndpointConfigurationConfigurer.java |   8 +-
 .../CalendarCalendarListEndpointConfiguration.java |   4 +-
 ...alendarListEndpointConfigurationConfigurer.java |   8 +-
 .../CalendarCalendarsEndpointConfiguration.java    |   4 +-
 ...arCalendarsEndpointConfigurationConfigurer.java |   8 +-
 .../CalendarChannelsEndpointConfiguration.java     |   4 +-
 ...darChannelsEndpointConfigurationConfigurer.java |   8 +-
 .../CalendarColorsEndpointConfiguration.java       |   4 +-
 ...endarColorsEndpointConfigurationConfigurer.java |   8 +-
 .../CalendarEventsEndpointConfiguration.java       |   4 +-
 ...endarEventsEndpointConfigurationConfigurer.java |   8 +-
 .../CalendarFreebusyEndpointConfiguration.java     |   4 +-
 ...darFreebusyEndpointConfigurationConfigurer.java |   8 +-
 .../CalendarSettingsEndpointConfiguration.java     |   4 +-
 ...darSettingsEndpointConfigurationConfigurer.java |   8 +-
 .../GoogleCalendarComponentConfigurer.java         |  33 +----
 .../GoogleCalendarConfigurationConfigurer.java     |   8 +-
 .../calendar/GoogleCalendarEndpointConfigurer.java |  53 +-------
 .../GoogleCalendarStreamComponentConfigurer.java   |  34 +----
 .../GoogleCalendarStreamEndpointConfigurer.java    |  52 +-------
 .../calendar/GoogleCalendarConfiguration.java      |   2 +-
 .../drive/DriveAboutEndpointConfiguration.java     |   4 +-
 .../DriveAboutEndpointConfigurationConfigurer.java |   8 +-
 .../drive/DriveAppsEndpointConfiguration.java      |   4 +-
 .../DriveAppsEndpointConfigurationConfigurer.java  |   8 +-
 .../drive/DriveChangesEndpointConfiguration.java   |   4 +-
 ...riveChangesEndpointConfigurationConfigurer.java |   8 +-
 .../drive/DriveChannelsEndpointConfiguration.java  |   4 +-
 ...iveChannelsEndpointConfigurationConfigurer.java |   8 +-
 .../drive/DriveChildrenEndpointConfiguration.java  |   4 +-
 ...iveChildrenEndpointConfigurationConfigurer.java |   8 +-
 .../drive/DriveCommentsEndpointConfiguration.java  |   4 +-
 ...iveCommentsEndpointConfigurationConfigurer.java |   8 +-
 .../drive/DriveFilesEndpointConfiguration.java     |   4 +-
 .../DriveFilesEndpointConfigurationConfigurer.java |   8 +-
 .../drive/DriveParentsEndpointConfiguration.java   |   4 +-
 ...riveParentsEndpointConfigurationConfigurer.java |   8 +-
 .../DrivePermissionsEndpointConfiguration.java     |   4 +-
 ...PermissionsEndpointConfigurationConfigurer.java |   8 +-
 .../DrivePropertiesEndpointConfiguration.java      |   4 +-
 ...ePropertiesEndpointConfigurationConfigurer.java |   8 +-
 .../drive/DriveRealtimeEndpointConfiguration.java  |   4 +-
 ...iveRealtimeEndpointConfigurationConfigurer.java |   8 +-
 .../drive/DriveRepliesEndpointConfiguration.java   |   4 +-
 ...riveRepliesEndpointConfigurationConfigurer.java |   8 +-
 .../drive/DriveRevisionsEndpointConfiguration.java |   4 +-
 ...veRevisionsEndpointConfigurationConfigurer.java |   8 +-
 .../drive/GoogleDriveComponentConfigurer.java      |  30 +----
 .../drive/GoogleDriveConfigurationConfigurer.java  |   8 +-
 .../drive/GoogleDriveEndpointConfigurer.java       |  51 +-------
 .../google/drive/GoogleDriveConfiguration.java     |   2 +-
 .../GmailUsersDraftsEndpointConfiguration.java     |   4 +-
 ...UsersDraftsEndpointConfigurationConfigurer.java |   8 +-
 .../mail/GmailUsersEndpointConfiguration.java      |   4 +-
 .../GmailUsersEndpointConfigurationConfigurer.java |   8 +-
 .../GmailUsersHistoryEndpointConfiguration.java    |   4 +-
 ...sersHistoryEndpointConfigurationConfigurer.java |   8 +-
 .../GmailUsersLabelsEndpointConfiguration.java     |   4 +-
 ...UsersLabelsEndpointConfigurationConfigurer.java |   8 +-
 ...rsMessagesAttachmentsEndpointConfiguration.java |   4 +-
 ...AttachmentsEndpointConfigurationConfigurer.java |   8 +-
 .../GmailUsersMessagesEndpointConfiguration.java   |   4 +-
 ...ersMessagesEndpointConfigurationConfigurer.java |   8 +-
 .../GmailUsersThreadsEndpointConfiguration.java    |   4 +-
 ...sersThreadsEndpointConfigurationConfigurer.java |   8 +-
 .../google/mail/GoogleMailComponentConfigurer.java |  29 +----
 .../mail/GoogleMailConfigurationConfigurer.java    |   8 +-
 .../google/mail/GoogleMailEndpointConfigurer.java  |  49 +------
 .../GoogleMailStreamComponentConfigurer.java       |  32 +----
 .../stream/GoogleMailStreamEndpointConfigurer.java |  50 +------
 .../google/mail/GoogleMailConfiguration.java       |   2 +-
 .../pubsub/GooglePubsubComponentConfigurer.java    |  26 +---
 .../pubsub/GooglePubsubEndpointConfigurer.java     |  32 +----
 .../sheets/GoogleSheetsComponentConfigurer.java    |  30 +----
 .../GoogleSheetsConfigurationConfigurer.java       |   8 +-
 .../sheets/GoogleSheetsEndpointConfigurer.java     |  50 +------
 .../SheetsSpreadsheetsEndpointConfiguration.java   |   4 +-
 ...preadsheetsEndpointConfigurationConfigurer.java |   8 +-
 ...etsSpreadsheetsValuesEndpointConfiguration.java |   4 +-
 ...heetsValuesEndpointConfigurationConfigurer.java |   8 +-
 .../GoogleSheetsStreamComponentConfigurer.java     |  36 +-----
 .../GoogleSheetsStreamEndpointConfigurer.java      |  54 +-------
 .../google/sheets/GoogleSheetsConfiguration.java   |   2 +-
 .../component/gora/GoraComponentConfigurer.java    |  22 +---
 .../component/gora/GoraEndpointConfigurer.java     |  43 +------
 .../component/grape/GrapeComponentConfigurer.java  |  22 +---
 .../component/grape/GrapeEndpointConfigurer.java   |  23 +---
 .../graphql/GraphqlComponentConfigurer.java        |  21 +--
 .../graphql/GraphqlEndpointConfigurer.java         |  31 +----
 .../component/grpc/GrpcComponentConfigurer.java    |  22 +---
 .../component/grpc/GrpcEndpointConfigurer.java     |  51 +-------
 .../eventbus/GuavaEventBusComponentConfigurer.java |  24 +---
 .../eventbus/GuavaEventBusEndpointConfigurer.java  |  28 +---
 .../HazelcastAtomicnumberComponentConfigurer.java  |  23 +---
 .../HazelcastAtomicnumberEndpointConfigurer.java   |  26 +---
 .../HazelcastInstanceComponentConfigurer.java      |  23 +---
 .../HazelcastInstanceEndpointConfigurer.java       |  28 +---
 .../list/HazelcastListComponentConfigurer.java     |  24 +---
 .../list/HazelcastListEndpointConfigurer.java      |  29 +----
 .../map/HazelcastMapComponentConfigurer.java       |  24 +---
 .../map/HazelcastMapEndpointConfigurer.java        |  29 +----
 .../HazelcastMultimapComponentConfigurer.java      |  24 +---
 .../HazelcastMultimapEndpointConfigurer.java       |  29 +----
 .../queue/HazelcastQueueComponentConfigurer.java   |  24 +---
 .../queue/HazelcastQueueEndpointConfigurer.java    |  32 +----
 .../HazelcastReplicatedmapComponentConfigurer.java |  24 +---
 .../HazelcastReplicatedmapEndpointConfigurer.java  |  29 +----
 .../HazelcastRingbufferComponentConfigurer.java    |  23 +---
 .../HazelcastRingbufferEndpointConfigurer.java     |  26 +---
 .../seda/HazelcastSedaComponentConfigurer.java     |  24 +---
 .../seda/HazelcastSedaEndpointConfigurer.java      |  34 +----
 .../set/HazelcastSetComponentConfigurer.java       |  24 +---
 .../set/HazelcastSetEndpointConfigurer.java        |  29 +----
 .../topic/HazelcastTopicComponentConfigurer.java   |  24 +---
 .../topic/HazelcastTopicEndpointConfigurer.java    |  30 +----
 .../component/hbase/HBaseComponentConfigurer.java  |  24 +---
 .../component/hbase/HBaseEndpointConfigurer.java   |  38 +-----
 .../component/hdfs/HdfsComponentConfigurer.java    |  24 +---
 .../component/hdfs/HdfsEndpointConfigurer.java     |  69 +---------
 .../component/http/HttpComponentConfigurer.java    |  45 +------
 .../component/http/HttpEndpointConfigurer.java     |  73 +----------
 .../hystrix/processor/HystrixReifier.java          |   6 +-
 .../iec60870/client/ClientComponentConfigurer.java |  23 +---
 .../iec60870/client/ClientEndpointConfigurer.java  |  42 +-----
 .../iec60870/server/ServerComponentConfigurer.java |  23 +---
 .../iec60870/server/ServerEndpointConfigurer.java  |  43 +------
 .../infinispan/InfinispanComponentConfigurer.java  |  48 +------
 .../infinispan/InfinispanEndpointConfigurer.java   |  51 +-------
 .../influxdb/InfluxDbComponentConfigurer.java      |  22 +---
 .../influxdb/InfluxDbEndpointConfigurer.java       |  28 +---
 .../component/iota/IOTAComponentConfigurer.java    |  21 +--
 .../component/iota/IOTAEndpointConfigurer.java     |  29 +----
 .../component/ipfs/IPFSComponentConfigurer.java    |  23 +---
 .../component/ipfs/IPFSEndpointConfigurer.java     |  24 +---
 .../component/irc/IrcComponentConfigurer.java      |  23 +---
 .../camel/component/irc/IrcEndpointConfigurer.java |  50 +------
 .../ironmq/IronMQComponentConfigurer.java          |  22 +---
 .../component/ironmq/IronMQEndpointConfigurer.java |  53 +-------
 .../component/jbpm/JBPMComponentConfigurer.java    |  22 +---
 .../component/jbpm/JBPMEndpointConfigurer.java     |  53 +-------
 .../jcache/JCacheComponentConfigurer.java          |  27 +---
 .../component/jcache/JCacheEndpointConfigurer.java |  44 +------
 .../jclouds/JcloudsComponentConfigurer.java        |  24 +---
 .../jclouds/JcloudsEndpointConfigurer.java         |  38 +-----
 .../component/jcr/JcrComponentConfigurer.java      |  22 +---
 .../camel/component/jcr/JcrEndpointConfigurer.java |  37 +-----
 .../component/jdbc/JdbcComponentConfigurer.java    |  22 +---
 .../component/jdbc/JdbcEndpointConfigurer.java     |  35 +----
 .../jetty9/JettyHttpComponent9Configurer.java      |  51 +-------
 .../jetty9/JettyHttpEndpoint9Configurer.java       |  54 +-------
 .../raft/JGroupsRaftComponentConfigurer.java       |  26 +---
 .../raft/JGroupsRaftEndpointConfigurer.java        |  27 +---
 .../jgroups/JGroupsComponentConfigurer.java        |  25 +---
 .../jgroups/JGroupsEndpointConfigurer.java         |  28 +---
 .../validator/jing/JingComponentConfigurer.java    |  21 +--
 .../validator/jing/JingEndpointConfigurer.java     |  24 +---
 .../component/jira/JiraComponentConfigurer.java    |  31 +----
 .../component/jira/JiraEndpointConfigurer.java     |  38 +-----
 .../component/jms/JmsComponentConfigurer.java      | 115 +----------------
 .../camel/component/jms/JmsEndpointConfigurer.java | 116 +----------------
 .../component/jmx/JMXComponentConfigurer.java      |  21 +--
 .../camel/component/jmx/JMXEndpointConfigurer.java |  51 +-------
 .../component/jolt/JoltComponentConfigurer.java    |  23 +---
 .../component/jolt/JoltEndpointConfigurer.java     |  29 +----
 .../component/jooq/JooqComponentConfigurer.java    |  27 +---
 .../component/jooq/JooqEndpointConfigurer.java     |  46 +------
 .../component/jpa/JpaComponentConfigurer.java      |  26 +---
 .../camel/component/jpa/JpaEndpointConfigurer.java |  66 +---------
 .../component/scp/ScpComponentConfigurer.java      |  22 +---
 .../camel/component/scp/ScpEndpointConfigurer.java |  46 +------
 .../component/jslt/JsltComponentConfigurer.java    |  24 +---
 .../component/jslt/JsltEndpointConfigurer.java     |  27 +---
 .../JsonValidatorComponentConfigurer.java          |  21 +--
 .../JsonValidatorEndpointConfigurer.java           |  30 +----
 .../jsonata/JsonataComponentConfigurer.java        |  21 +--
 .../jsonata/JsonataEndpointConfigurer.java         |  27 +---
 .../component/jt400/Jt400ComponentConfigurer.java  |  23 +---
 .../component/jt400/Jt400EndpointConfigurer.java   |  58 +--------
 .../component/kafka/KafkaComponentConfigurer.java  | 116 +----------------
 .../component/kafka/KafkaEndpointConfigurer.java   | 117 +----------------
 .../KubernetesConfigMapsComponentConfigurer.java   |  21 +--
 .../KubernetesConfigMapsEndpointConfigurer.java    |  42 +-----
 ...bernetesCustomResourcesComponentConfigurer.java |  22 +---
 ...ubernetesCustomResourcesEndpointConfigurer.java |  55 +-------
 .../KubernetesDeploymentsComponentConfigurer.java  |  22 +---
 .../KubernetesDeploymentsEndpointConfigurer.java   |  55 +-------
 .../hpa/KubernetesHPAComponentConfigurer.java      |  22 +---
 .../hpa/KubernetesHPAEndpointConfigurer.java       |  55 +-------
 .../job/KubernetesJobComponentConfigurer.java      |  22 +---
 .../job/KubernetesJobEndpointConfigurer.java       |  55 +-------
 .../KubernetesNamespacesComponentConfigurer.java   |  22 +---
 .../KubernetesNamespacesEndpointConfigurer.java    |  55 +-------
 .../nodes/KubernetesNodesComponentConfigurer.java  |  22 +---
 .../nodes/KubernetesNodesEndpointConfigurer.java   |  55 +-------
 ...rnetesPersistentVolumesComponentConfigurer.java |  21 +--
 ...ernetesPersistentVolumesEndpointConfigurer.java |  42 +-----
 ...PersistentVolumesClaimsComponentConfigurer.java |  21 +--
 ...sPersistentVolumesClaimsEndpointConfigurer.java |  42 +-----
 .../pods/KubernetesPodsComponentConfigurer.java    |  22 +---
 .../pods/KubernetesPodsEndpointConfigurer.java     |  55 +-------
 ...sReplicationControllersComponentConfigurer.java |  22 +---
 ...esReplicationControllersEndpointConfigurer.java |  55 +-------
 ...ubernetesResourcesQuotaComponentConfigurer.java |  21 +--
 ...KubernetesResourcesQuotaEndpointConfigurer.java |  42 +-----
 .../KubernetesSecretsComponentConfigurer.java      |  21 +--
 .../KubernetesSecretsEndpointConfigurer.java       |  42 +-----
 ...bernetesServiceAccountsComponentConfigurer.java |  21 +--
 ...ubernetesServiceAccountsEndpointConfigurer.java |  42 +-----
 .../KubernetesServicesComponentConfigurer.java     |  22 +---
 .../KubernetesServicesEndpointConfigurer.java      |  55 +-------
 .../OpenshiftBuildConfigsComponentConfigurer.java  |  21 +--
 .../OpenshiftBuildConfigsEndpointConfigurer.java   |  42 +-----
 .../builds/OpenshiftBuildsComponentConfigurer.java |  21 +--
 .../builds/OpenshiftBuildsEndpointConfigurer.java  |  42 +-----
 .../component/kudu/KuduComponentConfigurer.java    |  21 +--
 .../component/kudu/KuduEndpointConfigurer.java     |  26 +---
 .../language/LanguageComponentConfigurer.java      |  21 +--
 .../language/LanguageEndpointConfigurer.java       |  30 +----
 .../component/ldap/LdapComponentConfigurer.java    |  21 +--
 .../component/ldap/LdapEndpointConfigurer.java     |  27 +---
 .../component/ldif/LdifComponentConfigurer.java    |  21 +--
 .../component/ldif/LdifEndpointConfigurer.java     |  23 +---
 .../component/log/LogComponentConfigurer.java      |  22 +---
 .../camel/component/log/LogEndpointConfigurer.java |  48 +------
 .../service/lra/LRASagaServiceConfigurer.java      |  24 +---
 .../lucene/LuceneComponentConfigurer.java          |  26 +---
 .../component/lucene/LuceneEndpointConfigurer.java |  28 +---
 .../lumberjack/LumberjackComponentConfigurer.java  |  23 +---
 .../lumberjack/LumberjackEndpointConfigurer.java   |  27 +---
 .../component/mail/MailComponentConfigurer.java    |  61 +--------
 .../component/mail/MailEndpointConfigurer.java     |  88 +------------
 .../master/MasterComponentConfigurer.java          |  23 +---
 .../component/master/MasterEndpointConfigurer.java |  26 +---
 .../metrics/MetricsComponentConfigurer.java        |  22 +---
 .../metrics/MetricsEndpointConfigurer.java         |  30 +----
 .../micrometer/MicrometerComponentConfigurer.java  |  22 +---
 .../micrometer/MicrometerEndpointConfigurer.java   |  29 +----
 .../faulttolerance/FaultToleranceReifier.java      |   6 +-
 .../MicroProfileMetricsComponentConfigurer.java    |  22 +---
 .../MicroProfileMetricsEndpointConfigurer.java     |  35 +----
 .../milo/client/MiloClientComponentConfigurer.java |  43 +------
 .../milo/client/MiloClientEndpointConfigurer.java  |  50 +------
 .../milo/server/MiloServerComponentConfigurer.java |  39 +-----
 .../milo/server/MiloServerEndpointConfigurer.java  |  26 +---
 .../component/mina/MinaComponentConfigurer.java    |  47 +------
 .../component/mina/MinaEndpointConfigurer.java     |  51 +-------
 .../component/minio/MinioComponentConfigurer.java  |  66 +---------
 .../component/minio/MinioEndpointConfigurer.java   |  85 +-----------
 .../component/mock/MockComponentConfigurer.java    |  21 +--
 .../component/mock/MockEndpointConfigurer.java     |  33 +----
 .../mongodb/gridfs/GridFsComponentConfigurer.java  |  22 +---
 .../mongodb/gridfs/GridFsEndpointConfigurer.java   |  38 +-----
 .../mongodb/MongoDbComponentConfigurer.java        |  23 +---
 .../mongodb/MongoDbEndpointConfigurer.java         |  46 +------
 .../validator/msv/MsvComponentConfigurer.java      |  23 +---
 .../validator/msv/MsvEndpointConfigurer.java       |  23 +---
 .../mustache/MustacheComponentConfigurer.java      |  24 +---
 .../mustache/MustacheEndpointConfigurer.java       |  29 +----
 .../component/mvel/MvelComponentConfigurer.java    |  23 +---
 .../component/mvel/MvelEndpointConfigurer.java     |  27 +---
 .../mybatis/MyBatisBeanComponentConfigurer.java    |  23 +---
 .../mybatis/MyBatisBeanEndpointConfigurer.java     |  27 +---
 .../mybatis/MyBatisComponentConfigurer.java        |  24 +---
 .../mybatis/MyBatisEndpointConfigurer.java         |  52 +-------
 .../nagios/NagiosComponentConfigurer.java          |  26 +---
 .../component/nagios/NagiosEndpointConfigurer.java |  29 +----
 .../component/nats/NatsComponentConfigurer.java    |  25 +---
 .../component/nats/NatsEndpointConfigurer.java     |  48 +------
 .../netty/http/NettyHttpComponentConfigurer.java   |  94 +-------------
 .../netty/http/NettyHttpEndpointConfigurer.java    | 103 +--------------
 .../component/netty/NettyComponentConfigurer.java  |  91 +------------
 .../component/netty/NettyEndpointConfigurer.java   |  93 +-------------
 .../nitrite/NitriteComponentConfigurer.java        |  22 +---
 .../nitrite/NitriteEndpointConfigurer.java         |  31 +----
 .../component/nsq/NsqComponentConfigurer.java      |  24 +---
 .../camel/component/nsq/NsqEndpointConfigurer.java |  39 +-----
 .../component/OAIPMHComponentConfigurer.java       |  22 +---
 .../oaipmh/component/OAIPMHEndpointConfigurer.java |  51 +-------
 .../olingo2/Olingo2AppEndpointConfiguration.java   |   4 +-
 .../Olingo2AppEndpointConfigurationConfigurer.java |   8 +-
 .../olingo2/Olingo2ComponentConfigurer.java        |  37 +-----
 .../olingo2/Olingo2ConfigurationConfigurer.java    |   8 +-
 .../olingo2/Olingo2EndpointConfigurer.java         |  57 +-------
 .../component/olingo2/Olingo2Configuration.java    |   2 +-
 .../camel/component/olingo2/Olingo2Endpoint.java   |   6 +-
 .../olingo4/Olingo4AppEndpointConfiguration.java   |   4 +-
 .../Olingo4AppEndpointConfigurationConfigurer.java |   8 +-
 .../olingo4/Olingo4ComponentConfigurer.java        |  35 +----
 .../olingo4/Olingo4ConfigurationConfigurer.java    |   8 +-
 .../olingo4/Olingo4EndpointConfigurer.java         |  55 +-------
 .../component/olingo4/Olingo4Configuration.java    |   2 +-
 .../camel/component/olingo4/Olingo4Endpoint.java   |   6 +-
 .../cinder/CinderComponentConfigurer.java          |  21 +--
 .../openstack/cinder/CinderEndpointConfigurer.java |  31 +----
 .../glance/GlanceComponentConfigurer.java          |  21 +--
 .../openstack/glance/GlanceEndpointConfigurer.java |  30 +----
 .../keystone/KeystoneComponentConfigurer.java      |  21 +--
 .../keystone/KeystoneEndpointConfigurer.java       |  30 +----
 .../neutron/NeutronComponentConfigurer.java        |  21 +--
 .../neutron/NeutronEndpointConfigurer.java         |  31 +----
 .../openstack/nova/NovaComponentConfigurer.java    |  21 +--
 .../openstack/nova/NovaEndpointConfigurer.java     |  31 +----
 .../openstack/swift/SwiftComponentConfigurer.java  |  21 +--
 .../openstack/swift/SwiftEndpointConfigurer.java   |  31 +----
 .../OptaPlannerComponentConfigurer.java            |  22 +---
 .../optaplanner/OptaPlannerEndpointConfigurer.java |  31 +----
 .../component/paho/PahoComponentConfigurer.java    |  50 +------
 .../component/paho/PahoEndpointConfigurer.java     |  53 +-------
 .../component/pdf/PdfComponentConfigurer.java      |  21 +--
 .../camel/component/pdf/PdfEndpointConfigurer.java |  31 +----
 .../slot/PgReplicationSlotComponentConfigurer.java |  21 +--
 .../slot/PgReplicationSlotEndpointConfigurer.java  |  50 +------
 .../pgevent/PgEventComponentConfigurer.java        |  22 +---
 .../pgevent/PgEventEndpointConfigurer.java         |  32 +----
 .../http/PlatformHttpComponentConfigurer.java      |  22 +---
 .../http/PlatformHttpEndpointConfigurer.java       |  32 +----
 .../printer/PrinterComponentConfigurer.java        |  21 +--
 .../printer/PrinterEndpointConfigurer.java         |  35 +----
 .../pubnub/PubNubComponentConfigurer.java          |  22 +---
 .../component/pubnub/PubNubEndpointConfigurer.java |  36 +-----
 .../pulsar/PulsarComponentConfigurer.java          |  55 +-------
 .../component/pulsar/PulsarEndpointConfigurer.java |  58 +--------
 .../quartz/QuartzComponentConfigurer.java          |  32 +----
 .../component/quartz/QuartzEndpointConfigurer.java |  41 +-----
 .../quickfixj/QuickfixjComponentConfigurer.java    |  26 +---
 .../quickfixj/QuickfixjEndpointConfigurer.java     |  28 +---
 .../rabbitmq/RabbitMQComponentConfigurer.java      |  74 +----------
 .../rabbitmq/RabbitMQEndpointConfigurer.java       |  87 +------------
 .../ReactiveStreamsComponentConfigurer.java        |  28 +---
 .../streams/ReactiveStreamsEndpointConfigurer.java |  32 +----
 .../component/ref/RefComponentConfigurer.java      |  22 +---
 .../camel/component/ref/RefEndpointConfigurer.java |  26 +---
 .../component/resilience4j/ResilienceReifier.java  |   6 +-
 .../openapi/RestOpenApiComponentConfigurer.java    |  29 +----
 .../openapi/RestOpenApiEndpointConfigurer.java     |  29 +----
 .../swagger/RestSwaggerComponentConfigurer.java    |  29 +----
 .../swagger/RestSwaggerEndpointConfigurer.java     |  30 +----
 .../component/rest/RestApiComponentConfigurer.java |  21 +--
 .../component/rest/RestApiEndpointConfigurer.java  |  28 +---
 .../component/rest/RestComponentConfigurer.java    |  27 +---
 .../component/rest/RestEndpointConfigurer.java     |  40 +-----
 .../resteasy/ResteasyComponentConfigurer.java      |  25 +---
 .../resteasy/ResteasyEndpointConfigurer.java       |  62 +--------
 .../RobotFrameworkComponentConfigurer.java         |  70 +---------
 .../RobotFrameworkEndpointConfigurer.java          |  90 +------------
 .../component/rss/RssComponentConfigurer.java      |  21 +--
 .../camel/component/rss/RssEndpointConfigurer.java |  49 +------
 .../component/saga/SagaComponentConfigurer.java    |  21 +--
 .../component/saga/SagaEndpointConfigurer.java     |  23 +---
 .../salesforce/SalesforceComponentConfigurer.java  |  91 +------------
 .../salesforce/SalesforceEndpointConfigurer.java   |  66 +---------
 .../netweaver/NetWeaverComponentConfigurer.java    |  21 +--
 .../sap/netweaver/NetWeaverEndpointConfigurer.java |  28 +---
 .../xquery/XQueryComponentConfigurer.java          |  25 +---
 .../component/xquery/XQueryEndpointConfigurer.java |  54 +-------
 .../scheduler/SchedulerComponentConfigurer.java    |  22 +---
 .../scheduler/SchedulerEndpointConfigurer.java     |  42 +-----
 .../schematron/SchematronComponentConfigurer.java  |  21 +--
 .../schematron/SchematronEndpointConfigurer.java   |  26 +---
 .../component/seda/SedaComponentConfigurer.java    |  28 +---
 .../component/seda/SedaEndpointConfigurer.java     |  40 +-----
 .../service/ServiceComponentConfigurer.java        |  23 +---
 .../service/ServiceEndpointConfigurer.java         |  25 +---
 .../servicenow/ServiceNowComponentConfigurer.java  |  67 +---------
 .../servicenow/ServiceNowEndpointConfigurer.java   |  66 +---------
 .../servlet/ServletComponentConfigurer.java        |  29 +----
 .../servlet/ServletEndpointConfigurer.java         |  44 +------
 .../component/sip/SipComponentConfigurer.java      |  22 +---
 .../camel/component/sip/SipEndpointConfigurer.java |  66 +---------
 .../component/sjms/SjmsComponentConfigurer.java    |  38 +-----
 .../component/sjms/SjmsEndpointConfigurer.java     |  59 +--------
 .../sjms/batch/SjmsBatchComponentConfigurer.java   |  25 +---
 .../sjms/batch/SjmsBatchEndpointConfigurer.java    |  44 +------
 .../component/sjms2/Sjms2ComponentConfigurer.java  |  29 +----
 .../component/sjms2/Sjms2EndpointConfigurer.java   |  62 +--------
 .../component/slack/SlackComponentConfigurer.java  |  23 +---
 .../component/slack/SlackEndpointConfigurer.java   |  49 +------
 .../component/smpp/SmppComponentConfigurer.java    |  57 +-------
 .../component/smpp/SmppEndpointConfigurer.java     |  61 +--------
 .../component/snmp/SnmpComponentConfigurer.java    |  22 +---
 .../component/snmp/SnmpEndpointConfigurer.java     |  59 +--------
 .../component/solr/SolrComponentConfigurer.java    |  21 +--
 .../component/solr/SolrEndpointConfigurer.java     |  37 +-----
 .../component/SoroushBotComponentConfigurer.java   |  23 +---
 .../component/SoroushBotEndpointConfigurer.java    |  42 +-----
 .../component/spark/SparkComponentConfigurer.java  |  23 +---
 .../component/spark/SparkEndpointConfigurer.java   |  28 +---
 .../splunkhec/SplunkHECComponentConfigurer.java    |  21 +--
 .../splunkhec/SplunkHECEndpointConfigurer.java     |  30 +----
 .../splunk/SplunkComponentConfigurer.java          |  23 +---
 .../component/splunk/SplunkEndpointConfigurer.java |  65 +---------
 .../batch/SpringBatchComponentConfigurer.java      |  23 +---
 .../batch/SpringBatchEndpointConfigurer.java       |  26 +---
 .../SpringIntegrationComponentConfigurer.java      |  22 +---
 .../SpringIntegrationEndpointConfigurer.java       |  29 +----
 .../springldap/SpringLdapComponentConfigurer.java  |  21 +--
 .../springldap/SpringLdapEndpointConfigurer.java   |  25 +---
 .../component/redis/RedisComponentConfigurer.java  |  22 +---
 .../component/redis/RedisEndpointConfigurer.java   |  33 +----
 .../ws/SpringWebserviceComponentConfigurer.java    |  23 +---
 .../ws/SpringWebserviceEndpointConfigurer.java     |  46 +------
 .../component/event/EventComponentConfigurer.java  |  22 +---
 .../component/event/EventEndpointConfigurer.java   |  26 +---
 .../component/sql/SqlComponentConfigurer.java      |  24 +---
 .../camel/component/sql/SqlEndpointConfigurer.java |  68 +---------
 .../sql/stored/SqlStoredComponentConfigurer.java   |  22 +---
 .../sql/stored/SqlStoredEndpointConfigurer.java    |  29 +----
 .../component/ssh/SshComponentConfigurer.java      |  36 +-----
 .../camel/component/ssh/SshEndpointConfigurer.java |  56 +-------
 .../component/stax/StAXComponentConfigurer.java    |  21 +--
 .../component/stax/StAXEndpointConfigurer.java     |  23 +---
 .../component/stomp/StompComponentConfigurer.java  |  32 +----
 .../component/stomp/StompEndpointConfigurer.java   |  34 +----
 .../stream/StreamComponentConfigurer.java          |  22 +---
 .../component/stream/StreamEndpointConfigurer.java |  41 +-----
 .../StringTemplateComponentConfigurer.java         |  23 +---
 .../StringTemplateEndpointConfigurer.java          |  28 +---
 .../component/stub/StubComponentConfigurer.java    |  19 +--
 .../component/stub/StubEndpointConfigurer.java     |  31 +----
 .../telegram/TelegramComponentConfigurer.java      |  26 +---
 .../telegram/TelegramEndpointConfigurer.java       |  52 +-------
 .../thrift/ThriftComponentConfigurer.java          |  23 +---
 .../component/thrift/ThriftEndpointConfigurer.java |  36 +-----
 .../component/tika/TikaComponentConfigurer.java    |  21 +--
 .../component/tika/TikaEndpointConfigurer.java     |  27 +---
 .../component/timer/TimerComponentConfigurer.java  |  21 +--
 .../component/timer/TimerEndpointConfigurer.java   |  34 +----
 .../twilio/AccountEndpointConfiguration.java       |   4 +-
 .../AccountEndpointConfigurationConfigurer.java    |   8 +-
 ...sDependentPhoneNumberEndpointConfiguration.java |   4 +-
 ...PhoneNumberEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/AddressEndpointConfiguration.java       |   4 +-
 .../AddressEndpointConfigurationConfigurer.java    |   8 +-
 .../twilio/ApplicationEndpointConfiguration.java   |   4 +-
 ...ApplicationEndpointConfigurationConfigurer.java |   8 +-
 ...blePhoneNumberCountryEndpointConfiguration.java |   4 +-
 ...mberCountryEndpointConfigurationConfigurer.java |   8 +-
 ...oneNumberCountryLocalEndpointConfiguration.java |   4 +-
 ...ountryLocalEndpointConfigurationConfigurer.java |   8 +-
 ...neNumberCountryMobileEndpointConfiguration.java |   4 +-
 ...untryMobileEndpointConfigurationConfigurer.java |   8 +-
 ...NumberCountryTollFreeEndpointConfiguration.java |   4 +-
 ...tryTollFreeEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/CallEndpointConfiguration.java          |   4 +-
 .../CallEndpointConfigurationConfigurer.java       |   8 +-
 .../twilio/CallFeedbackEndpointConfiguration.java  |   4 +-
 ...allFeedbackEndpointConfigurationConfigurer.java |   8 +-
 .../CallFeedbackSummaryEndpointConfiguration.java  |   4 +-
 ...backSummaryEndpointConfigurationConfigurer.java |   8 +-
 .../CallNotificationEndpointConfiguration.java     |   4 +-
 ...otificationEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/CallRecordingEndpointConfiguration.java |   4 +-
 ...llRecordingEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/ConferenceEndpointConfiguration.java    |   4 +-
 .../ConferenceEndpointConfigurationConfigurer.java |   8 +-
 ...ConferenceParticipantEndpointConfiguration.java |   4 +-
 ...ParticipantEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/ConnectAppEndpointConfiguration.java    |   4 +-
 .../ConnectAppEndpointConfigurationConfigurer.java |   8 +-
 .../IncomingPhoneNumberEndpointConfiguration.java  |   4 +-
 ...PhoneNumberEndpointConfigurationConfigurer.java |   8 +-
 ...omingPhoneNumberLocalEndpointConfiguration.java |   4 +-
 ...NumberLocalEndpointConfigurationConfigurer.java |   8 +-
 ...mingPhoneNumberMobileEndpointConfiguration.java |   4 +-
 ...umberMobileEndpointConfigurationConfigurer.java |   8 +-
 ...ngPhoneNumberTollFreeEndpointConfiguration.java |   4 +-
 ...berTollFreeEndpointConfigurationConfigurer.java |   8 +-
 .../component/twilio/KeyEndpointConfiguration.java |   4 +-
 .../twilio/KeyEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/MessageEndpointConfiguration.java       |   4 +-
 .../MessageEndpointConfigurationConfigurer.java    |   8 +-
 .../MessageFeedbackEndpointConfiguration.java      |   4 +-
 ...ageFeedbackEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/MessageMediaEndpointConfiguration.java  |   4 +-
 ...essageMediaEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/NewKeyEndpointConfiguration.java        |   4 +-
 .../NewKeyEndpointConfigurationConfigurer.java     |   8 +-
 .../twilio/NewSigningKeyEndpointConfiguration.java |   4 +-
 ...wSigningKeyEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/NotificationEndpointConfiguration.java  |   4 +-
 ...otificationEndpointConfigurationConfigurer.java |   8 +-
 .../OutgoingCallerIdEndpointConfiguration.java     |   4 +-
 ...ingCallerIdEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/QueueEndpointConfiguration.java         |   4 +-
 .../QueueEndpointConfigurationConfigurer.java      |   8 +-
 .../twilio/QueueMemberEndpointConfiguration.java   |   4 +-
 ...QueueMemberEndpointConfigurationConfigurer.java |   8 +-
 .../RecordingAddOnResultEndpointConfiguration.java |   4 +-
 ...AddOnResultEndpointConfigurationConfigurer.java |   8 +-
 ...ingAddOnResultPayloadEndpointConfiguration.java |   4 +-
 ...sultPayloadEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/RecordingEndpointConfiguration.java     |   4 +-
 .../RecordingEndpointConfigurationConfigurer.java  |   8 +-
 ...ecordingTranscriptionEndpointConfiguration.java |   4 +-
 ...anscriptionEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/ShortCodeEndpointConfiguration.java     |   4 +-
 .../ShortCodeEndpointConfigurationConfigurer.java  |   8 +-
 .../twilio/SigningKeyEndpointConfiguration.java    |   4 +-
 .../SigningKeyEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/SipCredentialEndpointConfiguration.java |   4 +-
 ...pCredentialEndpointConfigurationConfigurer.java |   8 +-
 .../SipCredentialListEndpointConfiguration.java    |   4 +-
 ...dentialListEndpointConfigurationConfigurer.java |   8 +-
 ...CredentialListMappingEndpointConfiguration.java |   4 +-
 ...ListMappingEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/SipDomainEndpointConfiguration.java     |   4 +-
 .../SipDomainEndpointConfigurationConfigurer.java  |   8 +-
 ...essControlListMappingEndpointConfiguration.java |   4 +-
 ...ListMappingEndpointConfigurationConfigurer.java |   8 +-
 ...ipIpAccessControlListEndpointConfiguration.java |   4 +-
 ...ControlListEndpointConfigurationConfigurer.java |   8 +-
 ...sControlListIpAddressEndpointConfiguration.java |   4 +-
 ...stIpAddressEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/TokenEndpointConfiguration.java         |   4 +-
 .../TokenEndpointConfigurationConfigurer.java      |   8 +-
 .../twilio/TranscriptionEndpointConfiguration.java |   4 +-
 ...anscriptionEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/TwilioComponentConfigurer.java          |  27 +---
 .../twilio/TwilioConfigurationConfigurer.java      |   8 +-
 .../component/twilio/TwilioEndpointConfigurer.java |  44 +------
 .../UsageRecordAllTimeEndpointConfiguration.java   |   4 +-
 ...cordAllTimeEndpointConfigurationConfigurer.java |   8 +-
 .../UsageRecordDailyEndpointConfiguration.java     |   4 +-
 ...RecordDailyEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/UsageRecordEndpointConfiguration.java   |   4 +-
 ...UsageRecordEndpointConfigurationConfigurer.java |   8 +-
 .../UsageRecordLastMonthEndpointConfiguration.java |   4 +-
 ...rdLastMonthEndpointConfigurationConfigurer.java |   8 +-
 .../UsageRecordMonthlyEndpointConfiguration.java   |   4 +-
 ...cordMonthlyEndpointConfigurationConfigurer.java |   8 +-
 .../UsageRecordThisMonthEndpointConfiguration.java |   4 +-
 ...rdThisMonthEndpointConfigurationConfigurer.java |   8 +-
 .../UsageRecordTodayEndpointConfiguration.java     |   4 +-
 ...RecordTodayEndpointConfigurationConfigurer.java |   8 +-
 .../UsageRecordYearlyEndpointConfiguration.java    |   4 +-
 ...ecordYearlyEndpointConfigurationConfigurer.java |   8 +-
 .../UsageRecordYesterdayEndpointConfiguration.java |   4 +-
 ...rdYesterdayEndpointConfigurationConfigurer.java |   8 +-
 .../twilio/UsageTriggerEndpointConfiguration.java  |   4 +-
 ...sageTriggerEndpointConfigurationConfigurer.java |   8 +-
 .../ValidationRequestEndpointConfiguration.java    |   4 +-
 ...tionRequestEndpointConfigurationConfigurer.java |   8 +-
 .../component/twilio/TwilioConfiguration.java      |   2 +-
 .../TwitterDirectMessageComponentConfigurer.java   |  30 +----
 .../TwitterDirectMessageEndpointConfigurer.java    |  64 +--------
 .../search/TwitterSearchComponentConfigurer.java   |  30 +----
 .../search/TwitterSearchEndpointConfigurer.java    |  64 +--------
 .../TwitterTimelineComponentConfigurer.java        |  30 +----
 .../TwitterTimelineEndpointConfigurer.java         |  65 +---------
 .../undertow/UndertowComponentConfigurer.java      |  30 +----
 .../undertow/UndertowEndpointConfigurer.java       |  51 +-------
 .../validator/ValidatorComponentConfigurer.java    |  22 +---
 .../validator/ValidatorEndpointConfigurer.java     |  32 +----
 .../velocity/VelocityComponentConfigurer.java      |  24 +---
 .../velocity/VelocityEndpointConfigurer.java       |  29 +----
 .../vertx/http/VertxHttpComponentConfigurer.java   |  36 +-----
 .../vertx/http/VertxHttpEndpointConfigurer.java    |  44 +------
 .../VertxWebsocketComponentConfigurer.java         |  26 +---
 .../VertxWebsocketEndpointConfigurer.java          |  35 +----
 .../component/vertx/VertxComponentConfigurer.java  |  28 +---
 .../component/vertx/VertxEndpointConfigurer.java   |  27 +---
 .../camel/component/vm/VmComponentConfigurer.java  |  19 +--
 .../camel/component/vm/VmEndpointConfigurer.java   |  31 +----
 .../weather/WeatherComponentConfigurer.java        |  22 +---
 .../weather/WeatherEndpointConfigurer.java         |  62 +--------
 .../component/web3j/Web3jComponentConfigurer.java  |  57 +-------
 .../component/web3j/Web3jEndpointConfigurer.java   |  60 +--------
 .../webhook/WebhookComponentConfigurer.java        |  27 +---
 .../webhook/WebhookEndpointConfigurer.java         |  30 +----
 .../websocket/jsr356/JSR356EndpointConfigurer.java |  27 +---
 .../jsr356/JSR356WebSocketComponentConfigurer.java |  23 +---
 .../websocket/WebsocketComponentConfigurer.java    |  34 +----
 .../websocket/WebsocketEndpointConfigurer.java     |  42 +-----
 .../component/weka/WekaComponentConfigurer.java    |  21 +--
 .../component/weka/WekaEndpointConfigurer.java     |  32 +----
 .../wordpress/WordpressComponentConfigurer.java    |  31 +----
 .../wordpress/WordpressEndpointConfigurer.java     |  35 +----
 .../workday/WorkdayComponentConfigurer.java        |  21 +--
 .../workday/WorkdayEndpointConfigurer.java         |  31 +----
 .../xchange/XChangeComponentConfigurer.java        |  21 +--
 .../xchange/XChangeEndpointConfigurer.java         |  27 +---
 .../camel/component/xj/XJComponentConfigurer.java  |  20 +--
 .../camel/component/xj/XJEndpointConfigurer.java   |  39 +-----
 .../xmlsecurity/XmlSignerComponentConfigurer.java  |  48 +------
 .../xmlsecurity/XmlSignerEndpointConfigurer.java   |  49 +------
 .../XmlVerifierComponentConfigurer.java            |  38 +-----
 .../xmlsecurity/XmlVerifierEndpointConfigurer.java |  39 +-----
 .../component/xmpp/XmppComponentConfigurer.java    |  22 +---
 .../component/xmpp/XmppEndpointConfigurer.java     |  43 +------
 .../xslt/saxon/XsltSaxonComponentConfigurer.java   |  29 +----
 .../xslt/saxon/XsltSaxonEndpointConfigurer.java    |  38 +-----
 .../component/xslt/XsltComponentConfigurer.java    |  26 +---
 .../component/xslt/XsltEndpointConfigurer.java     |  35 +----
 .../yammer/YammerComponentConfigurer.java          |  34 +----
 .../component/yammer/YammerEndpointConfigurer.java |  52 +-------
 .../zendesk/ZendeskComponentConfigurer.java        |  29 +----
 .../zendesk/ZendeskConfigurationConfigurer.java    |   8 +-
 .../zendesk/ZendeskEndpointConfiguration.java      |   4 +-
 .../ZendeskEndpointConfigurationConfigurer.java    |   8 +-
 .../zendesk/ZendeskEndpointConfigurer.java         |  48 +------
 .../component/zendesk/ZendeskConfiguration.java    |   2 +-
 .../zookeepermaster/MasterComponentConfigurer.java |  27 +---
 .../zookeepermaster/MasterEndpointConfigurer.java  |  26 +---
 .../zookeeper/ZooKeeperComponentConfigurer.java    |  30 +----
 .../zookeeper/ZooKeeperEndpointConfigurer.java     |  34 +----
 .../main/java/org/apache/camel/spi/Configurer.java |  10 +-
 ....java => ExtendedPropertyConfigurerGetter.java} |  38 +-----
 .../apache/camel/spi/PropertyConfigurerGetter.java |  14 +-
 .../camel/impl/ExtendedCamelContextConfigurer.java |  95 +-------------
 .../camel/impl/RestConfigurationConfigurer.java    |  47 +------
 ...ToleranceConfigurationDefinitionConfigurer.java |  10 +-
 .../HystrixConfigurationDefinitionConfigurer.java  |  10 +-
 ...ilience4jConfigurationDefinitionConfigurer.java |  10 +-
 .../FaultToleranceConfigurationDefinition.java     |   2 +-
 .../model/HystrixConfigurationDefinition.java      |   2 +-
 .../model/Resilience4jConfigurationDefinition.java |   2 +-
 .../PropertyBindingSupportConfigurerTest.java      |  12 --
 ...ToleranceConfigurationPropertiesConfigurer.java |   5 +-
 ...althCheckConfigurationPropertiesConfigurer.java |  23 +---
 .../HealthConfigurationPropertiesConfigurer.java   |  24 +---
 .../HystrixConfigurationPropertiesConfigurer.java  |   5 +-
 .../main/LraConfigurationPropertiesConfigurer.java |  23 +---
 .../MainConfigurationPropertiesConfigurer.java     |  99 +-------------
 ...ilience4jConfigurationPropertiesConfigurer.java |   5 +-
 .../RestConfigurationPropertiesConfigurer.java     |  47 +------
 ...hreadPoolConfigurationPropertiesConfigurer.java |  27 +---
 .../FaultToleranceConfigurationProperties.java     |   2 +-
 .../main/HealthCheckConfigurationProperties.java   |   2 +-
 .../camel/main/HealthConfigurationProperties.java  |   2 +-
 .../camel/main/HystrixConfigurationProperties.java |   2 +-
 .../camel/main/LraConfigurationProperties.java     |   2 +-
 .../camel/main/MainConfigurationProperties.java    |   2 +-
 .../java/org/apache/camel/main/MainHelper.java     |   6 +-
 .../main/Resilience4jConfigurationProperties.java  |   2 +-
 .../camel/main/RestConfigurationProperties.java    |   2 +-
 .../main/ThreadPoolConfigurationProperties.java    |   2 +-
 .../apache/camel/main/MySecondBarConfigurer.java   |  21 +--
 .../apache/camel/main/MySecondFooConfigurer.java   |  20 +--
 .../DefaultExchangeFormatterConfigurer.java        |  36 +-----
 .../support/component/AbstractApiComponent.java    |   6 +-
 .../component/ApiMethodPropertiesHelper.java       |  14 +-
 .../src/main/resources/api-endpoint-config.vm      |   4 +-
 .../packaging/AbstractGenerateConfigurerMojo.java  |  89 ++++++++++---
 .../packaging/EndpointSchemaGeneratorMojo.java     |   5 +-
 .../packaging/PropertyConfigurerGenerator.java     |  95 +++++++-------
 1004 files changed, 2268 insertions(+), 25130 deletions(-)

diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java
index 243be89..4cfdaaf 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.activemq;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.jms.JmsComponentConfigurer;
 
@@ -16,113 +17,6 @@ import org.apache.camel.component.jms.JmsComponentConfigurer;
 @SuppressWarnings("unchecked")
 public class ActiveMQComponentConfigurer extends JmsComponentConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("brokerURL", java.lang.String.class);
-        map.put("clientId", java.lang.String.class);
-        map.put("connectionFactory", javax.jms.ConnectionFactory.class);
-        map.put("disableReplyTo", boolean.class);
-        map.put("durableSubscriptionName", java.lang.String.class);
-        map.put("jmsMessageType", org.apache.camel.component.jms.JmsMessageType.class);
-        map.put("replyTo", java.lang.String.class);
-        map.put("testConnectionOnStartup", boolean.class);
-        map.put("usePooledConnection", boolean.class);
-        map.put("useSingleConnection", boolean.class);
-        map.put("acknowledgementModeName", java.lang.String.class);
-        map.put("asyncConsumer", boolean.class);
-        map.put("autoStartup", boolean.class);
-        map.put("cacheLevel", int.class);
-        map.put("cacheLevelName", java.lang.String.class);
-        map.put("concurrentConsumers", int.class);
-        map.put("maxConcurrentConsumers", int.class);
-        map.put("replyToDeliveryPersistent", boolean.class);
-        map.put("selector", java.lang.String.class);
-        map.put("subscriptionDurable", boolean.class);
-        map.put("subscriptionName", java.lang.String.class);
-        map.put("subscriptionShared", boolean.class);
-        map.put("acceptMessagesWhileStopping", boolean.class);
-        map.put("allowReplyManagerQuickStop", boolean.class);
-        map.put("consumerType", org.apache.camel.component.jms.ConsumerType.class);
-        map.put("defaultTaskExecutorType", org.apache.camel.component.jms.DefaultTaskExecutorType.class);
-        map.put("eagerLoadingOfProperties", boolean.class);
-        map.put("eagerPoisonBody", java.lang.String.class);
-        map.put("exposeListenerSession", boolean.class);
-        map.put("replyToSameDestinationAllowed", boolean.class);
-        map.put("taskExecutor", org.springframework.core.task.TaskExecutor.class);
-        map.put("deliveryDelay", long.class);
-        map.put("deliveryMode", java.lang.Integer.class);
-        map.put("deliveryPersistent", boolean.class);
-        map.put("explicitQosEnabled", java.lang.Boolean.class);
-        map.put("formatDateHeadersToIso8601", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("preserveMessageQos", boolean.class);
-        map.put("priority", int.class);
-        map.put("replyToConcurrentConsumers", int.class);
-        map.put("replyToMaxConcurrentConsumers", int.class);
-        map.put("replyToOnTimeoutMaxConcurrentConsumers", int.class);
-        map.put("replyToOverride", java.lang.String.class);
-        map.put("replyToType", org.apache.camel.component.jms.ReplyToType.class);
-        map.put("requestTimeout", long.class);
-        map.put("timeToLive", long.class);
-        map.put("allowAdditionalHeaders", java.lang.String.class);
-        map.put("allowNullBody", boolean.class);
-        map.put("alwaysCopyMessage", boolean.class);
-        map.put("correlationProperty", java.lang.String.class);
-        map.put("disableTimeToLive", boolean.class);
-        map.put("forceSendOriginalMessage", boolean.class);
-        map.put("includeSentJMSMessageID", boolean.class);
-        map.put("replyToCacheLevelName", java.lang.String.class);
-        map.put("replyToDestinationSelectorName", java.lang.String.class);
-        map.put("streamMessageTypeEnabled", boolean.class);
-        map.put("allowAutoWiredConnectionFactory", boolean.class);
-        map.put("allowAutoWiredDestinationResolver", boolean.class);
-        map.put("allowSerializedHeaders", boolean.class);
-        map.put("artemisStreamingEnabled", boolean.class);
-        map.put("asyncStartListener", boolean.class);
-        map.put("asyncStopListener", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("configuration", org.apache.camel.component.jms.JmsConfiguration.class);
-        map.put("destinationResolver", org.springframework.jms.support.destination.DestinationResolver.class);
-        map.put("errorHandler", org.springframework.util.ErrorHandler.class);
-        map.put("exceptionListener", javax.jms.ExceptionListener.class);
-        map.put("idleConsumerLimit", int.class);
-        map.put("idleTaskExecutionLimit", int.class);
-        map.put("includeAllJMSXProperties", boolean.class);
-        map.put("jmsKeyFormatStrategy", org.apache.camel.component.jms.JmsKeyFormatStrategy.class);
-        map.put("mapJmsMessage", boolean.class);
-        map.put("maxMessagesPerTask", int.class);
-        map.put("messageConverter", org.springframework.jms.support.converter.MessageConverter.class);
-        map.put("messageCreatedStrategy", org.apache.camel.component.jms.MessageCreatedStrategy.class);
-        map.put("messageIdEnabled", boolean.class);
-        map.put("messageListenerContainerFactory", org.apache.camel.component.jms.MessageListenerContainerFactory.class);
-        map.put("messageTimestampEnabled", boolean.class);
-        map.put("pubSubNoLocal", boolean.class);
-        map.put("queueBrowseStrategy", org.apache.camel.component.jms.QueueBrowseStrategy.class);
-        map.put("receiveTimeout", long.class);
-        map.put("recoveryInterval", long.class);
-        map.put("requestTimeoutCheckerInterval", long.class);
-        map.put("transferException", boolean.class);
-        map.put("transferExchange", boolean.class);
-        map.put("trustAllPackages", boolean.class);
-        map.put("useMessageIDAsCorrelationID", boolean.class);
-        map.put("waitForProvisionCorrelationToBeUpdatedCounter", int.class);
-        map.put("waitForProvisionCorrelationToBeUpdatedThreadSleepingTime", long.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("errorHandlerLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("errorHandlerLogStackTrace", boolean.class);
-        map.put("password", java.lang.String.class);
-        map.put("username", java.lang.String.class);
-        map.put("transacted", boolean.class);
-        map.put("transactedInOut", boolean.class);
-        map.put("lazyCreateTransactionManager", boolean.class);
-        map.put("transactionManager", org.springframework.transaction.PlatformTransactionManager.class);
-        map.put("transactionName", java.lang.String.class);
-        map.put("transactionTimeout", int.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ActiveMQComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         ActiveMQComponent target = (ActiveMQComponent) obj;
@@ -140,15 +34,6 @@ public class ActiveMQComponentConfigurer extends JmsComponentConfigurer implemen
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "brokerurl":
diff --git a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java
index 889932b..42a3132 100644
--- a/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java
+++ b/components/camel-activemq/src/generated/java/org/apache/camel/component/activemq/ActiveMQEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.activemq;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.jms.JmsEndpointConfigurer;
 
@@ -16,109 +17,5 @@ import org.apache.camel.component.jms.JmsEndpointConfigurer;
 @SuppressWarnings("unchecked")
 public class ActiveMQEndpointConfigurer extends JmsEndpointConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("destinationType", java.lang.String.class);
-        map.put("destinationName", java.lang.String.class);
-        map.put("clientId", java.lang.String.class);
-        map.put("connectionFactory", javax.jms.ConnectionFactory.class);
-        map.put("disableReplyTo", boolean.class);
-        map.put("durableSubscriptionName", java.lang.String.class);
-        map.put("jmsMessageType", org.apache.camel.component.jms.JmsMessageType.class);
-        map.put("replyTo", java.lang.String.class);
-        map.put("testConnectionOnStartup", boolean.class);
-        map.put("acknowledgementModeName", java.lang.String.class);
-        map.put("asyncConsumer", boolean.class);
-        map.put("autoStartup", boolean.class);
-        map.put("cacheLevel", int.class);
-        map.put("cacheLevelName", java.lang.String.class);
-        map.put("concurrentConsumers", int.class);
-        map.put("maxConcurrentConsumers", int.class);
-        map.put("replyToDeliveryPersistent", boolean.class);
-        map.put("selector", java.lang.String.class);
-        map.put("subscriptionDurable", boolean.class);
-        map.put("subscriptionName", java.lang.String.class);
-        map.put("subscriptionShared", boolean.class);
-        map.put("acceptMessagesWhileStopping", boolean.class);
-        map.put("allowReplyManagerQuickStop", boolean.class);
-        map.put("consumerType", org.apache.camel.component.jms.ConsumerType.class);
-        map.put("defaultTaskExecutorType", org.apache.camel.component.jms.DefaultTaskExecutorType.class);
-        map.put("eagerLoadingOfProperties", boolean.class);
-        map.put("eagerPoisonBody", java.lang.String.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("exposeListenerSession", boolean.class);
-        map.put("replyToSameDestinationAllowed", boolean.class);
-        map.put("taskExecutor", org.springframework.core.task.TaskExecutor.class);
-        map.put("deliveryDelay", long.class);
-        map.put("deliveryMode", java.lang.Integer.class);
-        map.put("deliveryPersistent", boolean.class);
-        map.put("explicitQosEnabled", java.lang.Boolean.class);
-        map.put("formatDateHeadersToIso8601", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("preserveMessageQos", boolean.class);
-        map.put("priority", int.class);
-        map.put("replyToConcurrentConsumers", int.class);
-        map.put("replyToMaxConcurrentConsumers", int.class);
-        map.put("replyToOnTimeoutMaxConcurrentConsumers", int.class);
-        map.put("replyToOverride", java.lang.String.class);
-        map.put("replyToType", org.apache.camel.component.jms.ReplyToType.class);
-        map.put("requestTimeout", long.class);
-        map.put("timeToLive", long.class);
-        map.put("allowAdditionalHeaders", java.lang.String.class);
-        map.put("allowNullBody", boolean.class);
-        map.put("alwaysCopyMessage", boolean.class);
-        map.put("correlationProperty", java.lang.String.class);
-        map.put("disableTimeToLive", boolean.class);
-        map.put("forceSendOriginalMessage", boolean.class);
-        map.put("includeSentJMSMessageID", boolean.class);
-        map.put("replyToCacheLevelName", java.lang.String.class);
-        map.put("replyToDestinationSelectorName", java.lang.String.class);
-        map.put("streamMessageTypeEnabled", boolean.class);
-        map.put("allowSerializedHeaders", boolean.class);
-        map.put("artemisStreamingEnabled", boolean.class);
-        map.put("asyncStartListener", boolean.class);
-        map.put("asyncStopListener", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("destinationResolver", org.springframework.jms.support.destination.DestinationResolver.class);
-        map.put("errorHandler", org.springframework.util.ErrorHandler.class);
-        map.put("exceptionListener", javax.jms.ExceptionListener.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("idleConsumerLimit", int.class);
-        map.put("idleTaskExecutionLimit", int.class);
-        map.put("includeAllJMSXProperties", boolean.class);
-        map.put("jmsKeyFormatStrategy", org.apache.camel.component.jms.JmsKeyFormatStrategy.class);
-        map.put("mapJmsMessage", boolean.class);
-        map.put("maxMessagesPerTask", int.class);
-        map.put("messageConverter", org.springframework.jms.support.converter.MessageConverter.class);
-        map.put("messageCreatedStrategy", org.apache.camel.component.jms.MessageCreatedStrategy.class);
-        map.put("messageIdEnabled", boolean.class);
-        map.put("messageListenerContainerFactory", org.apache.camel.component.jms.MessageListenerContainerFactory.class);
-        map.put("messageTimestampEnabled", boolean.class);
-        map.put("pubSubNoLocal", boolean.class);
-        map.put("receiveTimeout", long.class);
-        map.put("recoveryInterval", long.class);
-        map.put("requestTimeoutCheckerInterval", long.class);
-        map.put("synchronous", boolean.class);
-        map.put("transferException", boolean.class);
-        map.put("transferExchange", boolean.class);
-        map.put("useMessageIDAsCorrelationID", boolean.class);
-        map.put("waitForProvisionCorrelationToBeUpdatedCounter", int.class);
-        map.put("waitForProvisionCorrelationToBeUpdatedThreadSleepingTime", long.class);
-        map.put("errorHandlerLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("errorHandlerLogStackTrace", boolean.class);
-        map.put("password", java.lang.String.class);
-        map.put("username", java.lang.String.class);
-        map.put("transacted", boolean.class);
-        map.put("transactedInOut", boolean.class);
-        map.put("lazyCreateTransactionManager", boolean.class);
-        map.put("transactionManager", org.springframework.transaction.PlatformTransactionManager.class);
-        map.put("transactionName", java.lang.String.class);
-        map.put("transactionTimeout", int.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ActiveMQEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
 }
 
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsComponentConfigurer.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsComponentConfigurer.java
index 22d105b..eef9b43 100644
--- a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsComponentConfigurer.java
+++ b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.ahc.ws;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.ahc.AhcComponentConfigurer;
 
@@ -16,23 +17,6 @@ import org.apache.camel.component.ahc.AhcComponentConfigurer;
 @SuppressWarnings("unchecked")
 public class WsComponentConfigurer extends AhcComponentConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("allowJavaSerializedObject", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("binding", org.apache.camel.component.ahc.AhcBinding.class);
-        map.put("client", org.asynchttpclient.AsyncHttpClient.class);
-        map.put("clientConfig", org.asynchttpclient.AsyncHttpClientConfig.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("sslContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class);
-        map.put("useGlobalSslContextParameters", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(WsComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         WsComponent target = (WsComponent) obj;
@@ -44,15 +28,6 @@ public class WsComponentConfigurer extends AhcComponentConfigurer implements Gen
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "bridgeerrorhandler":
diff --git a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointConfigurer.java b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointConfigurer.java
index bccc68d..670cf12 100644
--- a/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointConfigurer.java
+++ b/components/camel-ahc-ws/src/generated/java/org/apache/camel/component/ahc/ws/WsEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.ahc.ws;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.ahc.AhcEndpointConfigurer;
 
@@ -16,34 +17,6 @@ import org.apache.camel.component.ahc.AhcEndpointConfigurer;
 @SuppressWarnings("unchecked")
 public class WsEndpointConfigurer extends AhcEndpointConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("httpUri", java.net.URI.class);
-        map.put("bridgeEndpoint", boolean.class);
-        map.put("bufferSize", int.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("throwExceptionOnFailure", boolean.class);
-        map.put("transferException", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("sendMessageOnError", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("connectionClose", boolean.class);
-        map.put("cookieHandler", org.apache.camel.http.base.cookie.CookieHandler.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("useStreaming", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("binding", org.apache.camel.component.ahc.AhcBinding.class);
-        map.put("clientConfig", org.asynchttpclient.AsyncHttpClientConfig.class);
-        map.put("clientConfigOptions", java.util.Map.class);
-        map.put("synchronous", boolean.class);
-        map.put("clientConfigRealmOptions", java.util.Map.class);
-        map.put("sslContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(WsEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         WsEndpoint target = (WsEndpoint) obj;
@@ -63,15 +36,6 @@ public class WsEndpointConfigurer extends AhcEndpointConfigurer implements Gener
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "bridgeerrorhandler":
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcComponentConfigurer.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcComponentConfigurer.java
index 257d4ab..95546e7 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcComponentConfigurer.java
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.ahc;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,22 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AhcComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("lazyStartProducer", boolean.class);
-        map.put("allowJavaSerializedObject", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("binding", org.apache.camel.component.ahc.AhcBinding.class);
-        map.put("client", org.asynchttpclient.AsyncHttpClient.class);
-        map.put("clientConfig", org.asynchttpclient.AsyncHttpClientConfig.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("sslContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class);
-        map.put("useGlobalSslContextParameters", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AhcComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AhcComponent target = (AhcComponent) obj;
@@ -57,15 +42,6 @@ public class AhcComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "allowjavaserializedobject":
diff --git a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointConfigurer.java b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointConfigurer.java
index 8a8a5d7..61b8254 100644
--- a/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointConfigurer.java
+++ b/components/camel-ahc/src/generated/java/org/apache/camel/component/ahc/AhcEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.ahc;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AhcEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("httpUri", java.net.URI.class);
-        map.put("bridgeEndpoint", boolean.class);
-        map.put("bufferSize", int.class);
-        map.put("connectionClose", boolean.class);
-        map.put("cookieHandler", org.apache.camel.http.base.cookie.CookieHandler.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("throwExceptionOnFailure", boolean.class);
-        map.put("transferException", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("binding", org.apache.camel.component.ahc.AhcBinding.class);
-        map.put("clientConfig", org.asynchttpclient.AsyncHttpClientConfig.class);
-        map.put("clientConfigOptions", java.util.Map.class);
-        map.put("synchronous", boolean.class);
-        map.put("clientConfigRealmOptions", java.util.Map.class);
-        map.put("sslContextParameters", org.apache.camel.support.jsse.SSLContextParameters.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AhcEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AhcEndpoint target = (AhcEndpoint) obj;
@@ -76,15 +54,6 @@ public class AhcEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPComponentConfigurer.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPComponentConfigurer.java
index 4f9f61b..9134dab 100644
--- a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPComponentConfigurer.java
+++ b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.amqp;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.jms.JmsComponentConfigurer;
 
@@ -16,110 +17,6 @@ import org.apache.camel.component.jms.JmsComponentConfigurer;
 @SuppressWarnings("unchecked")
 public class AMQPComponentConfigurer extends JmsComponentConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("clientId", java.lang.String.class);
-        map.put("connectionFactory", javax.jms.ConnectionFactory.class);
-        map.put("disableReplyTo", boolean.class);
-        map.put("durableSubscriptionName", java.lang.String.class);
-        map.put("includeAmqpAnnotations", boolean.class);
-        map.put("jmsMessageType", org.apache.camel.component.jms.JmsMessageType.class);
-        map.put("replyTo", java.lang.String.class);
-        map.put("testConnectionOnStartup", boolean.class);
-        map.put("acknowledgementModeName", java.lang.String.class);
-        map.put("asyncConsumer", boolean.class);
-        map.put("autoStartup", boolean.class);
-        map.put("cacheLevel", int.class);
-        map.put("cacheLevelName", java.lang.String.class);
-        map.put("concurrentConsumers", int.class);
-        map.put("maxConcurrentConsumers", int.class);
-        map.put("replyToDeliveryPersistent", boolean.class);
-        map.put("selector", java.lang.String.class);
-        map.put("subscriptionDurable", boolean.class);
-        map.put("subscriptionName", java.lang.String.class);
-        map.put("subscriptionShared", boolean.class);
-        map.put("acceptMessagesWhileStopping", boolean.class);
-        map.put("allowReplyManagerQuickStop", boolean.class);
-        map.put("consumerType", org.apache.camel.component.jms.ConsumerType.class);
-        map.put("defaultTaskExecutorType", org.apache.camel.component.jms.DefaultTaskExecutorType.class);
-        map.put("eagerLoadingOfProperties", boolean.class);
-        map.put("eagerPoisonBody", java.lang.String.class);
-        map.put("exposeListenerSession", boolean.class);
-        map.put("replyToSameDestinationAllowed", boolean.class);
-        map.put("taskExecutor", org.springframework.core.task.TaskExecutor.class);
-        map.put("deliveryDelay", long.class);
-        map.put("deliveryMode", java.lang.Integer.class);
-        map.put("deliveryPersistent", boolean.class);
-        map.put("explicitQosEnabled", java.lang.Boolean.class);
-        map.put("formatDateHeadersToIso8601", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("preserveMessageQos", boolean.class);
-        map.put("priority", int.class);
-        map.put("replyToConcurrentConsumers", int.class);
-        map.put("replyToMaxConcurrentConsumers", int.class);
-        map.put("replyToOnTimeoutMaxConcurrentConsumers", int.class);
-        map.put("replyToOverride", java.lang.String.class);
-        map.put("replyToType", org.apache.camel.component.jms.ReplyToType.class);
-        map.put("requestTimeout", long.class);
-        map.put("timeToLive", long.class);
-        map.put("allowAdditionalHeaders", java.lang.String.class);
-        map.put("allowNullBody", boolean.class);
-        map.put("alwaysCopyMessage", boolean.class);
-        map.put("correlationProperty", java.lang.String.class);
-        map.put("disableTimeToLive", boolean.class);
-        map.put("forceSendOriginalMessage", boolean.class);
-        map.put("includeSentJMSMessageID", boolean.class);
-        map.put("replyToCacheLevelName", java.lang.String.class);
-        map.put("replyToDestinationSelectorName", java.lang.String.class);
-        map.put("streamMessageTypeEnabled", boolean.class);
-        map.put("allowAutoWiredConnectionFactory", boolean.class);
-        map.put("allowAutoWiredDestinationResolver", boolean.class);
-        map.put("allowSerializedHeaders", boolean.class);
-        map.put("artemisStreamingEnabled", boolean.class);
-        map.put("asyncStartListener", boolean.class);
-        map.put("asyncStopListener", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("configuration", org.apache.camel.component.jms.JmsConfiguration.class);
-        map.put("destinationResolver", org.springframework.jms.support.destination.DestinationResolver.class);
-        map.put("errorHandler", org.springframework.util.ErrorHandler.class);
-        map.put("exceptionListener", javax.jms.ExceptionListener.class);
-        map.put("idleConsumerLimit", int.class);
-        map.put("idleTaskExecutionLimit", int.class);
-        map.put("includeAllJMSXProperties", boolean.class);
-        map.put("jmsKeyFormatStrategy", org.apache.camel.component.jms.JmsKeyFormatStrategy.class);
-        map.put("mapJmsMessage", boolean.class);
-        map.put("maxMessagesPerTask", int.class);
-        map.put("messageConverter", org.springframework.jms.support.converter.MessageConverter.class);
-        map.put("messageCreatedStrategy", org.apache.camel.component.jms.MessageCreatedStrategy.class);
-        map.put("messageIdEnabled", boolean.class);
-        map.put("messageListenerContainerFactory", org.apache.camel.component.jms.MessageListenerContainerFactory.class);
-        map.put("messageTimestampEnabled", boolean.class);
-        map.put("pubSubNoLocal", boolean.class);
-        map.put("queueBrowseStrategy", org.apache.camel.component.jms.QueueBrowseStrategy.class);
-        map.put("receiveTimeout", long.class);
-        map.put("recoveryInterval", long.class);
-        map.put("requestTimeoutCheckerInterval", long.class);
-        map.put("transferException", boolean.class);
-        map.put("transferExchange", boolean.class);
-        map.put("useMessageIDAsCorrelationID", boolean.class);
-        map.put("waitForProvisionCorrelationToBeUpdatedCounter", int.class);
-        map.put("waitForProvisionCorrelationToBeUpdatedThreadSleepingTime", long.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("errorHandlerLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("errorHandlerLogStackTrace", boolean.class);
-        map.put("password", java.lang.String.class);
-        map.put("username", java.lang.String.class);
-        map.put("transacted", boolean.class);
-        map.put("transactedInOut", boolean.class);
-        map.put("lazyCreateTransactionManager", boolean.class);
-        map.put("transactionManager", org.springframework.transaction.PlatformTransactionManager.class);
-        map.put("transactionName", java.lang.String.class);
-        map.put("transactionTimeout", int.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AMQPComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AMQPComponent target = (AMQPComponent) obj;
@@ -131,15 +28,6 @@ public class AMQPComponentConfigurer extends JmsComponentConfigurer implements G
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "includeamqpannotations":
diff --git a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointConfigurer.java b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointConfigurer.java
index c75c8b9..4a8827c 100644
--- a/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointConfigurer.java
+++ b/components/camel-amqp/src/generated/java/org/apache/camel/component/amqp/AMQPEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.amqp;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.jms.JmsEndpointConfigurer;
 
@@ -16,109 +17,5 @@ import org.apache.camel.component.jms.JmsEndpointConfigurer;
 @SuppressWarnings("unchecked")
 public class AMQPEndpointConfigurer extends JmsEndpointConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("destinationType", java.lang.String.class);
-        map.put("destinationName", java.lang.String.class);
-        map.put("clientId", java.lang.String.class);
-        map.put("connectionFactory", javax.jms.ConnectionFactory.class);
-        map.put("disableReplyTo", boolean.class);
-        map.put("durableSubscriptionName", java.lang.String.class);
-        map.put("jmsMessageType", org.apache.camel.component.jms.JmsMessageType.class);
-        map.put("replyTo", java.lang.String.class);
-        map.put("testConnectionOnStartup", boolean.class);
-        map.put("acknowledgementModeName", java.lang.String.class);
-        map.put("asyncConsumer", boolean.class);
-        map.put("autoStartup", boolean.class);
-        map.put("cacheLevel", int.class);
-        map.put("cacheLevelName", java.lang.String.class);
-        map.put("concurrentConsumers", int.class);
-        map.put("maxConcurrentConsumers", int.class);
-        map.put("replyToDeliveryPersistent", boolean.class);
-        map.put("selector", java.lang.String.class);
-        map.put("subscriptionDurable", boolean.class);
-        map.put("subscriptionName", java.lang.String.class);
-        map.put("subscriptionShared", boolean.class);
-        map.put("acceptMessagesWhileStopping", boolean.class);
-        map.put("allowReplyManagerQuickStop", boolean.class);
-        map.put("consumerType", org.apache.camel.component.jms.ConsumerType.class);
-        map.put("defaultTaskExecutorType", org.apache.camel.component.jms.DefaultTaskExecutorType.class);
-        map.put("eagerLoadingOfProperties", boolean.class);
-        map.put("eagerPoisonBody", java.lang.String.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("exposeListenerSession", boolean.class);
-        map.put("replyToSameDestinationAllowed", boolean.class);
-        map.put("taskExecutor", org.springframework.core.task.TaskExecutor.class);
-        map.put("deliveryDelay", long.class);
-        map.put("deliveryMode", java.lang.Integer.class);
-        map.put("deliveryPersistent", boolean.class);
-        map.put("explicitQosEnabled", java.lang.Boolean.class);
-        map.put("formatDateHeadersToIso8601", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("preserveMessageQos", boolean.class);
-        map.put("priority", int.class);
-        map.put("replyToConcurrentConsumers", int.class);
-        map.put("replyToMaxConcurrentConsumers", int.class);
-        map.put("replyToOnTimeoutMaxConcurrentConsumers", int.class);
-        map.put("replyToOverride", java.lang.String.class);
-        map.put("replyToType", org.apache.camel.component.jms.ReplyToType.class);
-        map.put("requestTimeout", long.class);
-        map.put("timeToLive", long.class);
-        map.put("allowAdditionalHeaders", java.lang.String.class);
-        map.put("allowNullBody", boolean.class);
-        map.put("alwaysCopyMessage", boolean.class);
-        map.put("correlationProperty", java.lang.String.class);
-        map.put("disableTimeToLive", boolean.class);
-        map.put("forceSendOriginalMessage", boolean.class);
-        map.put("includeSentJMSMessageID", boolean.class);
-        map.put("replyToCacheLevelName", java.lang.String.class);
-        map.put("replyToDestinationSelectorName", java.lang.String.class);
-        map.put("streamMessageTypeEnabled", boolean.class);
-        map.put("allowSerializedHeaders", boolean.class);
-        map.put("artemisStreamingEnabled", boolean.class);
-        map.put("asyncStartListener", boolean.class);
-        map.put("asyncStopListener", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("destinationResolver", org.springframework.jms.support.destination.DestinationResolver.class);
-        map.put("errorHandler", org.springframework.util.ErrorHandler.class);
-        map.put("exceptionListener", javax.jms.ExceptionListener.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("idleConsumerLimit", int.class);
-        map.put("idleTaskExecutionLimit", int.class);
-        map.put("includeAllJMSXProperties", boolean.class);
-        map.put("jmsKeyFormatStrategy", org.apache.camel.component.jms.JmsKeyFormatStrategy.class);
-        map.put("mapJmsMessage", boolean.class);
-        map.put("maxMessagesPerTask", int.class);
-        map.put("messageConverter", org.springframework.jms.support.converter.MessageConverter.class);
-        map.put("messageCreatedStrategy", org.apache.camel.component.jms.MessageCreatedStrategy.class);
-        map.put("messageIdEnabled", boolean.class);
-        map.put("messageListenerContainerFactory", org.apache.camel.component.jms.MessageListenerContainerFactory.class);
-        map.put("messageTimestampEnabled", boolean.class);
-        map.put("pubSubNoLocal", boolean.class);
-        map.put("receiveTimeout", long.class);
-        map.put("recoveryInterval", long.class);
-        map.put("requestTimeoutCheckerInterval", long.class);
-        map.put("synchronous", boolean.class);
-        map.put("transferException", boolean.class);
-        map.put("transferExchange", boolean.class);
-        map.put("useMessageIDAsCorrelationID", boolean.class);
-        map.put("waitForProvisionCorrelationToBeUpdatedCounter", int.class);
-        map.put("waitForProvisionCorrelationToBeUpdatedThreadSleepingTime", long.class);
-        map.put("errorHandlerLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("errorHandlerLogStackTrace", boolean.class);
-        map.put("password", java.lang.String.class);
-        map.put("username", java.lang.String.class);
-        map.put("transacted", boolean.class);
-        map.put("transactedInOut", boolean.class);
-        map.put("lazyCreateTransactionManager", boolean.class);
-        map.put("transactionManager", org.springframework.transaction.PlatformTransactionManager.class);
-        map.put("transactionName", java.lang.String.class);
-        map.put("transactionTimeout", int.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AMQPEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
 }
 
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsComponentConfigurer.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsComponentConfigurer.java
index b8af951..bca69df 100644
--- a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsComponentConfigurer.java
+++ b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.apns;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,17 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class ApnsComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("apnsService", com.notnoop.apns.ApnsService.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ApnsComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         ApnsComponent target = (ApnsComponent) obj;
@@ -44,15 +34,6 @@ public class ApnsComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "apnsservice":
diff --git a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointConfigurer.java b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointConfigurer.java
index ac38cf1..d6ccddc 100644
--- a/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointConfigurer.java
+++ b/components/camel-apns/src/generated/java/org/apache/camel/component/apns/ApnsEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.apns;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,37 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class ApnsEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("name", java.lang.String.class);
-        map.put("tokens", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ApnsEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         ApnsEndpoint target = (ApnsEndpoint) obj;
@@ -97,15 +67,6 @@ public class ApnsEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "backofferrorthreshold":
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbComponentConfigurer.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbComponentConfigurer.java
index ed0e8f0..560eb50 100644
--- a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbComponentConfigurer.java
+++ b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.arangodb;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class ArangoDbComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("configuration", org.apache.camel.component.arangodb.ArangoDbConfiguration.class);
-        map.put("documentCollection", java.lang.String.class);
-        map.put("edgeCollection", java.lang.String.class);
-        map.put("graph", java.lang.String.class);
-        map.put("host", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.arangodb.ArangoDbOperation.class);
-        map.put("port", int.class);
-        map.put("vertexCollection", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("password", java.lang.String.class);
-        map.put("user", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ArangoDbComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.arangodb.ArangoDbConfiguration getOrCreateConfiguration(ArangoDbComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.arangodb.ArangoDbConfiguration());
@@ -68,15 +50,6 @@ public class ArangoDbComponentConfigurer extends PropertyConfigurerSupport imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointConfigurer.java b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointConfigurer.java
index 2078204..2d621bf 100644
--- a/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointConfigurer.java
+++ b/components/camel-arangodb/src/generated/java/org/apache/camel/component/arangodb/ArangoDbEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.arangodb;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class ArangoDbEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("database", java.lang.String.class);
-        map.put("documentCollection", java.lang.String.class);
-        map.put("edgeCollection", java.lang.String.class);
-        map.put("graph", java.lang.String.class);
-        map.put("host", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.arangodb.ArangoDbOperation.class);
-        map.put("port", int.class);
-        map.put("vertexCollection", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("password", java.lang.String.class);
-        map.put("user", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ArangoDbEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         ArangoDbEndpoint target = (ArangoDbEndpoint) obj;
@@ -62,15 +43,6 @@ public class ArangoDbEndpointConfigurer extends PropertyConfigurerSupport implem
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java
index 6fbbbbe..38ebb90 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfiguration.java
@@ -4,10 +4,10 @@
  */
 package org.apache.camel.component.as2;
 
-import org.apache.camel.spi.Configurer;
 import org.apache.camel.spi.ApiMethod;
 import org.apache.camel.spi.ApiParam;
 import org.apache.camel.spi.ApiParams;
+import org.apache.camel.spi.Configurer;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 
@@ -18,7 +18,7 @@ import org.apache.camel.spi.UriParams;
            description = "Sends EDI Messages over HTTP",
            apiMethods = {@ApiMethod(methodName = "send", description="Send ediMessage to trading partner", signatures={"org.apache.http.protocol.HttpCoreContext send(String ediMessage, String requestUri, String subject, String from, String as2From, String as2To, org.apache.camel.component.as2.api.AS2MessageStructure as2MessageStructure, org.apache.http.entity.ContentType ediMessageContentType, String ediMessageTransferEncoding, org.apache.camel.component.as2.api.AS2SignatureAlgorithm sig [...]
 @UriParams
-@Configurer(api = true)
+@Configurer(extended = true)
 public final class AS2ClientManagerEndpointConfiguration extends AS2Configuration {
     @UriParam
     @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "send", description="AS2 name of sender")})
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfigurationConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfigurationConfigurer.java
index 1576148..2485bc9 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfigurationConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ClientManagerEndpointConfigurationConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.as2;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.as2.AS2ClientManagerEndpointConfiguration;
 
@@ -14,7 +15,7 @@ import org.apache.camel.component.as2.AS2ClientManagerEndpointConfiguration;
  * Generated by camel build tools - do NOT edit this file!
  */
 @SuppressWarnings("unchecked")
-public class AS2ClientManagerEndpointConfigurationConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
+public class AS2ClientManagerEndpointConfigurationConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, ExtendedPropertyConfigurerGetter {
 
     private static final Map<String, Object> ALL_OPTIONS;
     static {
@@ -125,9 +126,6 @@ public class AS2ClientManagerEndpointConfigurationConfigurer extends org.apache.
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ComponentConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ComponentConfigurer.java
index a039f6c..d0e90af 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ComponentConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.as2;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,17 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AS2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("configuration", org.apache.camel.component.as2.AS2Configuration.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AS2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AS2Component target = (AS2Component) obj;
@@ -43,15 +33,6 @@ public class AS2ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ConfigurationConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ConfigurationConfigurer.java
index b4d3f3a..92edd2e 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ConfigurationConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ConfigurationConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.as2;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.as2.AS2Configuration;
 
@@ -14,7 +15,7 @@ import org.apache.camel.component.as2.AS2Configuration;
  * Generated by camel build tools - do NOT edit this file!
  */
 @SuppressWarnings("unchecked")
-public class AS2ConfigurationConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
+public class AS2ConfigurationConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, ExtendedPropertyConfigurerGetter {
 
     private static final Map<String, Object> ALL_OPTIONS;
     static {
@@ -119,9 +120,6 @@ public class AS2ConfigurationConfigurer extends org.apache.camel.support.compone
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointConfigurer.java
index 2824472..9a9170a 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.as2;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,47 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AS2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("apiName", org.apache.camel.component.as2.internal.AS2ApiName.class);
-        map.put("methodName", java.lang.String.class);
-        map.put("as2From", java.lang.String.class);
-        map.put("as2MessageStructure", org.apache.camel.component.as2.api.AS2MessageStructure.class);
-        map.put("as2To", java.lang.String.class);
-        map.put("as2Version", java.lang.String.class);
-        map.put("clientFqdn", java.lang.String.class);
-        map.put("compressionAlgorithm", org.apache.camel.component.as2.api.AS2CompressionAlgorithm.class);
-        map.put("decryptingPrivateKey", java.security.PrivateKey.class);
-        map.put("dispositionNotificationTo", java.lang.String.class);
-        map.put("ediMessageTransferEncoding", java.lang.String.class);
-        map.put("ediMessageType", org.apache.http.entity.ContentType.class);
-        map.put("encryptingAlgorithm", org.apache.camel.component.as2.api.AS2EncryptionAlgorithm.class);
-        map.put("encryptingCertificateChain", java.security.cert.Certificate[].class);
-        map.put("from", java.lang.String.class);
-        map.put("inBody", java.lang.String.class);
-        map.put("mdnMessageTemplate", java.lang.String.class);
-        map.put("requestUri", java.lang.String.class);
-        map.put("server", java.lang.String.class);
-        map.put("serverFqdn", java.lang.String.class);
-        map.put("serverPortNumber", java.lang.Integer.class);
-        map.put("signedReceiptMicAlgorithms", java.lang.String[].class);
-        map.put("signingAlgorithm", org.apache.camel.component.as2.api.AS2SignatureAlgorithm.class);
-        map.put("signingCertificateChain", java.security.cert.Certificate[].class);
-        map.put("signingPrivateKey", java.security.PrivateKey.class);
-        map.put("subject", java.lang.String.class);
-        map.put("targetHostname", java.lang.String.class);
-        map.put("targetPortNumber", java.lang.Integer.class);
-        map.put("userAgent", java.lang.String.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AS2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AS2Endpoint target = (AS2Endpoint) obj;
@@ -126,15 +86,6 @@ public class AS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "as2from":
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java
index 851b63c..973a551 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfiguration.java
@@ -4,10 +4,10 @@
  */
 package org.apache.camel.component.as2;
 
-import org.apache.camel.spi.Configurer;
 import org.apache.camel.spi.ApiMethod;
 import org.apache.camel.spi.ApiParam;
 import org.apache.camel.spi.ApiParams;
+import org.apache.camel.spi.Configurer;
 import org.apache.camel.spi.UriParam;
 import org.apache.camel.spi.UriParams;
 
@@ -18,7 +18,7 @@ import org.apache.camel.spi.UriParams;
            description = "Receives EDI Messages over HTTP",
            apiMethods = {@ApiMethod(methodName = "listen", signatures={"void listen(String requestUriPattern, org.apache.http.protocol.HttpRequestHandler handler)"})}, aliases = {})
 @UriParams
-@Configurer(api = true)
+@Configurer(extended = true)
 public final class AS2ServerManagerEndpointConfiguration extends AS2Configuration {
     @UriParam
     @ApiParam(optional = false, apiMethods = {@ApiMethod(methodName = "listen")})
diff --git a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfigurationConfigurer.java b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfigurationConfigurer.java
index 0997bfd..c4168b8 100644
--- a/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfigurationConfigurer.java
+++ b/components/camel-as2/camel-as2-component/src/generated/java/org/apache/camel/component/as2/AS2ServerManagerEndpointConfigurationConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.as2;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.as2.AS2ServerManagerEndpointConfiguration;
 
@@ -14,7 +15,7 @@ import org.apache.camel.component.as2.AS2ServerManagerEndpointConfiguration;
  * Generated by camel build tools - do NOT edit this file!
  */
 @SuppressWarnings("unchecked")
-public class AS2ServerManagerEndpointConfigurationConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
+public class AS2ServerManagerEndpointConfigurationConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, ExtendedPropertyConfigurerGetter {
 
     private static final Map<String, Object> ALL_OPTIONS;
     static {
@@ -122,9 +123,6 @@ public class AS2ServerManagerEndpointConfigurationConfigurer extends org.apache.
         return ALL_OPTIONS;
     }
 
-    public static void clearBootstrapConfigurers() {
-    }
-
     @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
diff --git a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java
index ba3c1bd..093f09b 100644
--- a/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java
+++ b/components/camel-as2/camel-as2-component/src/main/java/org/apache/camel/component/as2/AS2Configuration.java
@@ -36,7 +36,7 @@ import org.apache.http.entity.ContentType;
  * Component configuration for AS2 component.
  */
 @UriParams
-@Configurer(api = true)
+@Configurer(extended = true)
 public class AS2Configuration {
 
     @UriPath
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskComponentConfigurer.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskComponentConfigurer.java
index 0cda512..0a2807d 100644
--- a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskComponentConfigurer.java
+++ b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.asterisk;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,16 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AsteriskComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AsteriskComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AsteriskComponent target = (AsteriskComponent) obj;
@@ -41,15 +32,6 @@ public class AsteriskComponentConfigurer extends PropertyConfigurerSupport imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointConfigurer.java b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointConfigurer.java
index 5472ee2..2df7a93 100644
--- a/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointConfigurer.java
+++ b/components/camel-asterisk/src/generated/java/org/apache/camel/component/asterisk/AsteriskEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.asterisk;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,24 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AsteriskEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("name", java.lang.String.class);
-        map.put("hostname", java.lang.String.class);
-        map.put("password", java.lang.String.class);
-        map.put("username", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("action", org.apache.camel.component.asterisk.AsteriskAction.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AsteriskEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AsteriskEndpoint target = (AsteriskEndpoint) obj;
@@ -58,15 +41,6 @@ public class AsteriskEndpointConfigurer extends PropertyConfigurerSupport implem
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "action": return org.apache.camel.component.asterisk.AsteriskAction.class;
diff --git a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapComponentConfigurer.java b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapComponentConfigurer.java
index 4ec5ba4..939e0fd 100644
--- a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapComponentConfigurer.java
+++ b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atlasmap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,16 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtlasMapComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("lazyStartProducer", boolean.class);
-        map.put("atlasContextFactory", io.atlasmap.api.AtlasContextFactory.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtlasMapComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtlasMapComponent target = (AtlasMapComponent) obj;
@@ -41,15 +32,6 @@ public class AtlasMapComponentConfigurer extends PropertyConfigurerSupport imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atlascontextfactory":
diff --git a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointConfigurer.java b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointConfigurer.java
index ae2cb9d..c49a293 100644
--- a/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointConfigurer.java
+++ b/components/camel-atlasmap/src/generated/java/org/apache/camel/component/atlasmap/AtlasMapEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atlasmap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,23 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtlasMapEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("resourceUri", java.lang.String.class);
-        map.put("allowContextMapAll", boolean.class);
-        map.put("contentCache", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("sourceMapName", java.lang.String.class);
-        map.put("targetMapMode", org.apache.camel.component.atlasmap.AtlasMapEndpoint.TargetMapMode.class);
-        map.put("targetMapName", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("propertiesFile", java.lang.String.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtlasMapEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtlasMapEndpoint target = (AtlasMapEndpoint) obj;
@@ -59,15 +43,6 @@ public class AtlasMapEndpointConfigurer extends PropertyConfigurerSupport implem
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "allowcontextmapall":
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosComponentConfigurer.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosComponentConfigurer.java
index 4774b46..16fdb19 100644
--- a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosComponentConfigurer.java
+++ b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atmos;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,20 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtmosComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("uri", java.lang.String.class);
-        map.put("fullTokenId", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("sslValidation", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtmosComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtmosComponent target = (AtmosComponent) obj;
@@ -52,15 +39,6 @@ public class AtmosComponentConfigurer extends PropertyConfigurerSupport implemen
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointConfigurer.java b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointConfigurer.java
index f33f113..991ef1f 100644
--- a/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointConfigurer.java
+++ b/components/camel-atmos/src/generated/java/org/apache/camel/component/atmos/AtmosEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atmos;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtmosEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("name", java.lang.String.class);
-        map.put("operation", org.apache.camel.component.atmos.util.AtmosOperation.class);
-        map.put("localPath", java.lang.String.class);
-        map.put("newRemotePath", java.lang.String.class);
-        map.put("query", java.lang.String.class);
-        map.put("remotePath", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("uri", java.lang.String.class);
-        map.put("fullTokenId", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("sslValidation", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtmosEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtmosEndpoint target = (AtmosEndpoint) obj;
@@ -73,15 +51,6 @@ public class AtmosEndpointConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurer.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurer.java
index d47aedb..97216b1 100644
--- a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurer.java
+++ b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atmosphere.websocket;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.servlet.ServletComponentConfigurer;
 
@@ -16,24 +17,6 @@ import org.apache.camel.component.servlet.ServletComponentConfigurer;
 @SuppressWarnings("unchecked")
 public class WebsocketComponentConfigurer extends ServletComponentConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("servletName", java.lang.String.class);
-        map.put("attachmentMultipartBinding", boolean.class);
-        map.put("fileNameExtWhitelist", java.lang.String.class);
-        map.put("httpRegistry", org.apache.camel.http.common.HttpRegistry.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("allowJavaSerializedObject", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("httpBinding", org.apache.camel.http.common.HttpBinding.class);
-        map.put("httpConfiguration", org.apache.camel.http.common.HttpConfiguration.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(WebsocketComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         WebsocketComponent target = (WebsocketComponent) obj;
@@ -45,15 +28,6 @@ public class WebsocketComponentConfigurer extends ServletComponentConfigurer imp
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "lazystartproducer":
diff --git a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointConfigurer.java b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointConfigurer.java
index 18d7107..d817561 100644
--- a/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointConfigurer.java
+++ b/components/camel-atmosphere-websocket/src/generated/java/org/apache/camel/component/atmosphere/websocket/WebsocketEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atmosphere.websocket;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.servlet.ServletEndpointConfigurer;
 
@@ -16,42 +17,6 @@ import org.apache.camel.component.servlet.ServletEndpointConfigurer;
 @SuppressWarnings("unchecked")
 public class WebsocketEndpointConfigurer extends ServletEndpointConfigurer implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("servicePath", java.lang.String.class);
-        map.put("chunked", boolean.class);
-        map.put("disableStreamCache", boolean.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("sendToAll", boolean.class);
-        map.put("transferException", boolean.class);
-        map.put("useStreaming", boolean.class);
-        map.put("httpBinding", org.apache.camel.http.common.HttpBinding.class);
-        map.put("async", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("httpMethodRestrict", java.lang.String.class);
-        map.put("matchOnUriPrefix", boolean.class);
-        map.put("muteException", boolean.class);
-        map.put("responseBufferSize", java.lang.Integer.class);
-        map.put("servletName", java.lang.String.class);
-        map.put("attachmentMultipartBinding", boolean.class);
-        map.put("eagerCheckContentAvailable", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("fileNameExtWhitelist", java.lang.String.class);
-        map.put("optionsEnabled", boolean.class);
-        map.put("traceEnabled", boolean.class);
-        map.put("bridgeEndpoint", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("mapHttpMessageBody", boolean.class);
-        map.put("mapHttpMessageFormUrlEncodedBody", boolean.class);
-        map.put("mapHttpMessageHeaders", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(WebsocketEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         WebsocketEndpoint target = (WebsocketEndpoint) obj;
@@ -69,15 +34,6 @@ public class WebsocketEndpointConfigurer extends ServletEndpointConfigurer imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "bridgeendpoint":
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomComponentConfigurer.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomComponentConfigurer.java
index dbb9992..3945869 100644
--- a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomComponentConfigurer.java
+++ b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atom;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,15 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtomComponent target = (AtomComponent) obj;
@@ -38,15 +30,6 @@ public class AtomComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointConfigurer.java b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointConfigurer.java
index d5b3ea4..c36c511 100644
--- a/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointConfigurer.java
+++ b/components/camel-atom/src/generated/java/org/apache/camel/component/atom/AtomEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atom;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,43 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("feedUri", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("feedHeader", boolean.class);
-        map.put("filter", boolean.class);
-        map.put("lastUpdate", java.util.Date.class);
-        map.put("password", java.lang.String.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("sortEntries", boolean.class);
-        map.put("splitEntries", boolean.class);
-        map.put("throttleEntries", boolean.class);
-        map.put("username", java.lang.String.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtomEndpoint target = (AtomEndpoint) obj;
@@ -113,15 +77,6 @@ public class AtomEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "backofferrorthreshold":
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapComponentConfigurer.java
index b494b27..64f8697 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.map;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,31 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixMapComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configuration", org.apache.camel.component.atomix.client.map.AtomixMapConfiguration.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.map.AtomixMap.Action.class);
-        map.put("key", java.lang.Object.class);
-        map.put("nodes", java.util.List.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("ttl", long.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMapComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.atomix.client.map.AtomixMapConfiguration getOrCreateConfiguration(AtomixMapComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.atomix.client.map.AtomixMapConfiguration());
@@ -87,15 +63,6 @@ public class AtomixMapComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointConfigurer.java
index d3d3346..72c2d43 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/map/AtomixMapEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.map;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,34 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixMapEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("resourceName", java.lang.String.class);
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.map.AtomixMap.Action.class);
-        map.put("key", java.lang.Object.class);
-        map.put("nodes", java.lang.String.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("ttl", long.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMapEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtomixMapEndpoint target = (AtomixMapEndpoint) obj;
@@ -87,15 +60,6 @@ public class AtomixMapEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingComponentConfigurer.java
index 21c1010..262bb5c 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.messaging;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,32 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixMessagingComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("broadcastType", org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType.class);
-        map.put("channelName", java.lang.String.class);
-        map.put("configuration", org.apache.camel.component.atomix.client.messaging.AtomixMessagingConfiguration.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action.class);
-        map.put("memberName", java.lang.String.class);
-        map.put("nodes", java.util.List.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMessagingComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.atomix.client.messaging.AtomixMessagingConfiguration getOrCreateConfiguration(AtomixMessagingComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.atomix.client.messaging.AtomixMessagingConfiguration());
@@ -92,15 +67,6 @@ public class AtomixMessagingComponentConfigurer extends PropertyConfigurerSuppor
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointConfigurer.java
index 0985ae0..353a163 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/messaging/AtomixMessagingEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.messaging;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,35 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixMessagingEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("resourceName", java.lang.String.class);
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("broadcastType", org.apache.camel.component.atomix.client.messaging.AtomixMessaging.BroadcastType.class);
-        map.put("channelName", java.lang.String.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.messaging.AtomixMessaging.Action.class);
-        map.put("memberName", java.lang.String.class);
-        map.put("nodes", java.lang.String.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMessagingEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtomixMessagingEndpoint target = (AtomixMessagingEndpoint) obj;
@@ -92,15 +64,6 @@ public class AtomixMessagingEndpointConfigurer extends PropertyConfigurerSupport
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapComponentConfigurer.java
index 3840bfe..8093554 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.multimap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,30 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixMultiMapComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configuration", org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action.class);
-        map.put("key", java.lang.Object.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("nodes", java.util.List.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("ttl", long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMultiMapComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration getOrCreateConfiguration(AtomixMultiMapComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.atomix.client.multimap.AtomixMultiMapConfiguration());
@@ -84,15 +61,6 @@ public class AtomixMultiMapComponentConfigurer extends PropertyConfigurerSupport
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointConfigurer.java
index 901fca1..b0a3a20 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/multimap/AtomixMultiMapEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.multimap;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,31 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixMultiMapEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("resourceName", java.lang.String.class);
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.multimap.AtomixMultiMap.Action.class);
-        map.put("key", java.lang.Object.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("nodes", java.lang.String.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("ttl", long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixMultiMapEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtomixMultiMapEndpoint target = (AtomixMultiMapEndpoint) obj;
@@ -78,15 +54,6 @@ public class AtomixMultiMapEndpointConfigurer extends PropertyConfigurerSupport
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueComponentConfigurer.java
index dca8ec6..775a96d 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.queue;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixQueueComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configuration", org.apache.camel.component.atomix.client.queue.AtomixQueueConfiguration.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.queue.AtomixQueue.Action.class);
-        map.put("nodes", java.util.List.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixQueueComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.atomix.client.queue.AtomixQueueConfiguration getOrCreateConfiguration(AtomixQueueComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.atomix.client.queue.AtomixQueueConfiguration());
@@ -83,15 +61,6 @@ public class AtomixQueueComponentConfigurer extends PropertyConfigurerSupport im
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointConfigurer.java
index 31f7eb0..eb0e597 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/queue/AtomixQueueEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.queue;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,32 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixQueueEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("resourceName", java.lang.String.class);
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.queue.AtomixQueue.Action.class);
-        map.put("nodes", java.lang.String.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixQueueEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtomixQueueEndpoint target = (AtomixQueueEndpoint) obj;
@@ -83,15 +58,6 @@ public class AtomixQueueEndpointConfigurer extends PropertyConfigurerSupport imp
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetComponentConfigurer.java
index 147f26b..04b7ff5 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.set;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,30 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixSetComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configuration", org.apache.camel.component.atomix.client.set.AtomixSetConfiguration.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.set.AtomixSet.Action.class);
-        map.put("nodes", java.util.List.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("ttl", long.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixSetComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.atomix.client.set.AtomixSetConfiguration getOrCreateConfiguration(AtomixSetComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.atomix.client.set.AtomixSetConfiguration());
@@ -85,15 +62,6 @@ public class AtomixSetComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointConfigurer.java
index 66548ad..2eb7ca1 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/set/AtomixSetEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.set;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,33 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixSetEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("resourceName", java.lang.String.class);
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.set.AtomixSet.Action.class);
-        map.put("nodes", java.lang.String.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("ttl", long.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixSetEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtomixSetEndpoint target = (AtomixSetEndpoint) obj;
@@ -85,15 +59,6 @@ public class AtomixSetEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueComponentConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueComponentConfigurer.java
index 6b3324f..ccdd709 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueComponentConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.value;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,30 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixValueComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configuration", org.apache.camel.component.atomix.client.value.AtomixValueConfiguration.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.value.AtomixValue.Action.class);
-        map.put("nodes", java.util.List.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("ttl", long.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixValueComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.atomix.client.value.AtomixValueConfiguration getOrCreateConfiguration(AtomixValueComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.atomix.client.value.AtomixValueConfiguration());
@@ -85,15 +62,6 @@ public class AtomixValueComponentConfigurer extends PropertyConfigurerSupport im
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointConfigurer.java b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointConfigurer.java
index 12dbda3..751c61a 100644
--- a/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointConfigurer.java
+++ b/components/camel-atomix/src/generated/java/org/apache/camel/component/atomix/client/value/AtomixValueEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.atomix.client.value;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,33 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AtomixValueEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("resourceName", java.lang.String.class);
-        map.put("atomix", io.atomix.Atomix.class);
-        map.put("configurationUri", java.lang.String.class);
-        map.put("defaultAction", org.apache.camel.component.atomix.client.value.AtomixValue.Action.class);
-        map.put("nodes", java.lang.String.class);
-        map.put("resultHeader", java.lang.String.class);
-        map.put("transportClassName", java.lang.String.class);
-        map.put("ttl", long.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("defaultResourceConfig", java.util.Properties.class);
-        map.put("defaultResourceOptions", java.util.Properties.class);
-        map.put("ephemeral", boolean.class);
-        map.put("readConsistency", io.atomix.resource.ReadConsistency.class);
-        map.put("resourceConfigs", java.util.Map.class);
-        map.put("resourceOptions", java.util.Map.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AtomixValueEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AtomixValueEndpoint target = (AtomixValueEndpoint) obj;
@@ -85,15 +59,6 @@ public class AtomixValueEndpointConfigurer extends PropertyConfigurerSupport imp
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "atomix": return io.atomix.Atomix.class;
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroComponentConfigurer.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroComponentConfigurer.java
index 090268a..1397aa3 100644
--- a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroComponentConfigurer.java
+++ b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.avro;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,23 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AvroComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("protocol", org.apache.avro.Protocol.class);
-        map.put("protocolClassName", java.lang.String.class);
-        map.put("protocolLocation", java.lang.String.class);
-        map.put("reflectionProtocol", boolean.class);
-        map.put("singleParameter", boolean.class);
-        map.put("uriAuthority", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("configuration", org.apache.camel.component.avro.AvroConfiguration.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AvroComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.avro.AvroConfiguration getOrCreateConfiguration(AvroComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.avro.AvroConfiguration());
@@ -67,15 +51,6 @@ public class AvroComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointConfigurer.java b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointConfigurer.java
index fe72200..860d3cd 100644
--- a/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointConfigurer.java
+++ b/components/camel-avro-rpc/src/generated/java/org/apache/camel/component/avro/AvroEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.avro;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AvroEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("transport", org.apache.camel.component.avro.AvroTransport.class);
-        map.put("port", int.class);
-        map.put("host", java.lang.String.class);
-        map.put("messageName", java.lang.String.class);
-        map.put("protocol", org.apache.avro.Protocol.class);
-        map.put("protocolClassName", java.lang.String.class);
-        map.put("protocolLocation", java.lang.String.class);
-        map.put("reflectionProtocol", boolean.class);
-        map.put("singleParameter", boolean.class);
-        map.put("uriAuthority", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AvroEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AvroEndpoint target = (AvroEndpoint) obj;
@@ -70,15 +48,6 @@ public class AvroEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java
index 05740bf..59e7177 100644
--- a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java
+++ b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.cw;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class CwComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonCwClient", com.amazonaws.services.cloudwatch.AmazonCloudWatch.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.cw.CwConfiguration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("name", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("timestamp", java.util.Date.class);
-        map.put("unit", java.lang.String.class);
-        map.put("value", java.lang.Double.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(CwComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.cw.CwConfiguration getOrCreateConfiguration(CwComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.cw.CwConfiguration());
@@ -78,15 +57,6 @@ public class CwComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java
index f28f423..74ed15d 100644
--- a/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java
+++ b/components/camel-aws-cw/src/generated/java/org/apache/camel/component/aws/cw/CwEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.cw;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class CwEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("namespace", java.lang.String.class);
-        map.put("amazonCwClient", com.amazonaws.services.cloudwatch.AmazonCloudWatch.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("name", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("timestamp", java.util.Date.class);
-        map.put("unit", java.lang.String.class);
-        map.put("value", java.lang.Double.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(CwEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         CwEndpoint target = (CwEndpoint) obj;
@@ -72,15 +50,6 @@ public class CwEndpointConfigurer extends PropertyConfigurerSupport implements G
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurer.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurer.java
index 957c31d..a27f426 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurer.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ddb;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,30 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class DdbComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonDDBClient", com.amazonaws.services.dynamodbv2.AmazonDynamoDB.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.ddb.DdbConfiguration.class);
-        map.put("consistentRead", boolean.class);
-        map.put("keyAttributeName", java.lang.String.class);
-        map.put("keyAttributeType", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.ddb.DdbOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("readCapacity", java.lang.Long.class);
-        map.put("region", java.lang.String.class);
-        map.put("writeCapacity", java.lang.Long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(DdbComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.ddb.DdbConfiguration getOrCreateConfiguration(DdbComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.ddb.DdbConfiguration());
@@ -87,15 +64,6 @@ public class DdbComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointConfigurer.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointConfigurer.java
index 802cc38..e913f6d 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointConfigurer.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddb/DdbEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ddb;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,31 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class DdbEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("tableName", java.lang.String.class);
-        map.put("amazonDDBClient", com.amazonaws.services.dynamodbv2.AmazonDynamoDB.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("consistentRead", boolean.class);
-        map.put("keyAttributeName", java.lang.String.class);
-        map.put("keyAttributeType", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.ddb.DdbOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("readCapacity", java.lang.Long.class);
-        map.put("region", java.lang.String.class);
-        map.put("writeCapacity", java.lang.Long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(DdbEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         DdbEndpoint target = (DdbEndpoint) obj;
@@ -81,15 +57,6 @@ public class DdbEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurer.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurer.java
index 056cc54..9ad58de 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurer.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ddbstream;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class DdbStreamComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("amazonDynamoDbStreamsClient", com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.ddbstream.DdbStreamConfiguration.class);
-        map.put("iteratorType", com.amazonaws.services.dynamodbv2.model.ShardIteratorType.class);
-        map.put("maxResultsPerRequest", int.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("sequenceNumberProvider", org.apache.camel.component.aws.ddbstream.SequenceNumberProvider.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(DdbStreamComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.ddbstream.DdbStreamConfiguration getOrCreateConfiguration(DdbStreamComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.ddbstream.DdbStreamConfiguration());
@@ -79,15 +59,6 @@ public class DdbStreamComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointConfigurer.java b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointConfigurer.java
index ea5317a..8834077 100644
--- a/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointConfigurer.java
+++ b/components/camel-aws-ddb/src/generated/java/org/apache/camel/component/aws/ddbstream/DdbStreamEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ddbstream;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,46 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class DdbStreamEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("tableName", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("amazonDynamoDbStreamsClient", com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreams.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("iteratorType", com.amazonaws.services.dynamodbv2.model.ShardIteratorType.class);
-        map.put("maxResultsPerRequest", int.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("sequenceNumberProvider", org.apache.camel.component.aws.ddbstream.SequenceNumberProvider.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(DdbStreamEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         DdbStreamEndpoint target = (DdbStreamEndpoint) obj;
@@ -124,15 +85,6 @@ public class DdbStreamEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurer.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurer.java
index c6d0409..c4b3677 100644
--- a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurer.java
+++ b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ec2;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EC2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("amazonEc2Client", com.amazonaws.services.ec2.AmazonEC2.class);
-        map.put("configuration", org.apache.camel.component.aws.ec2.EC2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.ec2.EC2Operations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EC2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.ec2.EC2Configuration getOrCreateConfiguration(EC2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.ec2.EC2Configuration());
@@ -72,15 +54,6 @@ public class EC2ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointConfigurer.java b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointConfigurer.java
index ad27e60..806c9c2 100644
--- a/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointConfigurer.java
+++ b/components/camel-aws-ec2/src/generated/java/org/apache/camel/component/aws/ec2/EC2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ec2;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EC2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("amazonEc2Client", com.amazonaws.services.ec2.AmazonEC2.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.ec2.EC2Operations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EC2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         EC2Endpoint target = (EC2Endpoint) obj;
@@ -66,15 +47,6 @@ public class EC2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
index 224e892..f899768 100644
--- a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
+++ b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ecs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class ECSComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("configuration", org.apache.camel.component.aws.ecs.ECSConfiguration.class);
-        map.put("ecsClient", com.amazonaws.services.ecs.AmazonECS.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.ecs.ECSOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ECSComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.ecs.ECSConfiguration getOrCreateConfiguration(ECSComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.ecs.ECSConfiguration());
@@ -72,15 +54,6 @@ public class ECSComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
index 6dc4189..0bf848d 100644
--- a/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
+++ b/components/camel-aws-ecs/src/generated/java/org/apache/camel/component/aws/ecs/ECSEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ecs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class ECSEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("ecsClient", com.amazonaws.services.ecs.AmazonECS.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.ecs.ECSOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ECSEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         ECSEndpoint target = (ECSEndpoint) obj;
@@ -66,15 +47,6 @@ public class ECSEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSComponentConfigurer.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSComponentConfigurer.java
index 376ffba..6d9d22f 100644
--- a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSComponentConfigurer.java
+++ b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.eks;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EKSComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("configuration", org.apache.camel.component.aws.eks.EKSConfiguration.class);
-        map.put("eksClient", com.amazonaws.services.eks.AmazonEKS.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.eks.EKSOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EKSComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.eks.EKSConfiguration getOrCreateConfiguration(EKSComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.eks.EKSConfiguration());
@@ -72,15 +54,6 @@ public class EKSComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointConfigurer.java b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointConfigurer.java
index e112e4a..8a03c0e 100644
--- a/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointConfigurer.java
+++ b/components/camel-aws-eks/src/generated/java/org/apache/camel/component/aws/eks/EKSEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.eks;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EKSEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("eksClient", com.amazonaws.services.eks.AmazonEKS.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.eks.EKSOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EKSEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         EKSEndpoint target = (EKSEndpoint) obj;
@@ -66,15 +47,6 @@ public class EKSEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMComponentConfigurer.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMComponentConfigurer.java
index 0efcf70..749107c 100644
--- a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMComponentConfigurer.java
+++ b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.iam;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class IAMComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("configuration", org.apache.camel.component.aws.iam.IAMConfiguration.class);
-        map.put("iamClient", com.amazonaws.services.identitymanagement.AmazonIdentityManagement.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.iam.IAMOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(IAMComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.iam.IAMConfiguration getOrCreateConfiguration(IAMComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.iam.IAMConfiguration());
@@ -72,15 +54,6 @@ public class IAMComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointConfigurer.java b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointConfigurer.java
index ab5cb0c..cfbcd97 100644
--- a/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointConfigurer.java
+++ b/components/camel-aws-iam/src/generated/java/org/apache/camel/component/aws/iam/IAMEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.iam;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class IAMEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("iamClient", com.amazonaws.services.identitymanagement.AmazonIdentityManagement.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.iam.IAMOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(IAMEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         IAMEndpoint target = (IAMEndpoint) obj;
@@ -66,15 +47,6 @@ public class IAMEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurer.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurer.java
index b1f3dc8..1aa9789 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurer.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.firehose;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,24 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KinesisFirehoseComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonKinesisFirehoseClient", com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisFirehoseComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration getOrCreateConfiguration(KinesisFirehoseComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.firehose.KinesisFirehoseConfiguration());
@@ -70,15 +53,6 @@ public class KinesisFirehoseComponentConfigurer extends PropertyConfigurerSuppor
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointConfigurer.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointConfigurer.java
index 4906e59..1b55829 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointConfigurer.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/firehose/KinesisFirehoseEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.firehose;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KinesisFirehoseEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("streamName", java.lang.String.class);
-        map.put("amazonKinesisFirehoseClient", com.amazonaws.services.kinesisfirehose.AmazonKinesisFirehose.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisFirehoseEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KinesisFirehoseEndpoint target = (KinesisFirehoseEndpoint) obj;
@@ -64,15 +46,6 @@ public class KinesisFirehoseEndpointConfigurer extends PropertyConfigurerSupport
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurer.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurer.java
index 270162a..64deae9 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurer.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.kinesis;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,30 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KinesisComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonKinesisClient", com.amazonaws.services.kinesis.AmazonKinesis.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.kinesis.KinesisConfiguration.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("iteratorType", com.amazonaws.services.kinesis.model.ShardIteratorType.class);
-        map.put("maxResultsPerRequest", int.class);
-        map.put("sequenceNumber", java.lang.String.class);
-        map.put("shardClosed", org.apache.camel.component.aws.kinesis.KinesisShardClosedStrategyEnum.class);
-        map.put("shardId", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.kinesis.KinesisConfiguration getOrCreateConfiguration(KinesisComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.kinesis.KinesisConfiguration());
@@ -88,15 +65,6 @@ public class KinesisComponentConfigurer extends PropertyConfigurerSupport implem
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointConfigurer.java b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointConfigurer.java
index 15d1d5b..a884760 100644
--- a/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointConfigurer.java
+++ b/components/camel-aws-kinesis/src/generated/java/org/apache/camel/component/aws/kinesis/KinesisEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.kinesis;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,49 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KinesisEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("streamName", java.lang.String.class);
-        map.put("amazonKinesisClient", com.amazonaws.services.kinesis.AmazonKinesis.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("iteratorType", com.amazonaws.services.kinesis.model.ShardIteratorType.class);
-        map.put("maxResultsPerRequest", int.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("sequenceNumber", java.lang.String.class);
-        map.put("shardClosed", org.apache.camel.component.aws.kinesis.KinesisShardClosedStrategyEnum.class);
-        map.put("shardId", java.lang.String.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KinesisEndpoint target = (KinesisEndpoint) obj;
@@ -133,15 +91,6 @@ public class KinesisEndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSComponentConfigurer.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSComponentConfigurer.java
index 03c138b..bc68234 100644
--- a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSComponentConfigurer.java
+++ b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.kms;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KMSComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("configuration", org.apache.camel.component.aws.kms.KMSConfiguration.class);
-        map.put("kmsClient", com.amazonaws.services.kms.AWSKMS.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.kms.KMSOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KMSComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.kms.KMSConfiguration getOrCreateConfiguration(KMSComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.kms.KMSConfiguration());
@@ -72,15 +54,6 @@ public class KMSComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointConfigurer.java b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointConfigurer.java
index 72019fb..b151521 100644
--- a/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointConfigurer.java
+++ b/components/camel-aws-kms/src/generated/java/org/apache/camel/component/aws/kms/KMSEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.kms;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KMSEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("kmsClient", com.amazonaws.services.kms.AWSKMS.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.kms.KMSOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KMSEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KMSEndpoint target = (KMSEndpoint) obj;
@@ -66,15 +47,6 @@ public class KMSEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurer.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurer.java
index 34257d4..746687b 100644
--- a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurer.java
+++ b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.lambda;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class LambdaComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.lambda.LambdaConfiguration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.lambda.LambdaOperations.class);
-        map.put("region", java.lang.String.class);
-        map.put("awsLambdaClient", com.amazonaws.services.lambda.AWSLambda.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(LambdaComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.lambda.LambdaConfiguration getOrCreateConfiguration(LambdaComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.lambda.LambdaConfiguration());
@@ -72,15 +54,6 @@ public class LambdaComponentConfigurer extends PropertyConfigurerSupport impleme
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointConfigurer.java b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointConfigurer.java
index 3f51ae6..ecabd67 100644
--- a/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointConfigurer.java
+++ b/components/camel-aws-lambda/src/generated/java/org/apache/camel/component/aws/lambda/LambdaEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.lambda;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class LambdaEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("function", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.lambda.LambdaOperations.class);
-        map.put("region", java.lang.String.class);
-        map.put("awsLambdaClient", com.amazonaws.services.lambda.AWSLambda.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(LambdaEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         LambdaEndpoint target = (LambdaEndpoint) obj;
@@ -66,15 +47,6 @@ public class LambdaEndpointConfigurer extends PropertyConfigurerSupport implemen
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java
index bfc7b07..de8084f 100644
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java
+++ b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.mq;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class MQComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("amazonMqClient", com.amazonaws.services.mq.AmazonMQ.class);
-        map.put("configuration", org.apache.camel.component.aws.mq.MQConfiguration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.mq.MQOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MQComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.mq.MQConfiguration getOrCreateConfiguration(MQComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.mq.MQConfiguration());
@@ -72,15 +54,6 @@ public class MQComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java
index 0398d0d..4af7a7a 100644
--- a/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java
+++ b/components/camel-aws-mq/src/generated/java/org/apache/camel/component/aws/mq/MQEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.mq;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class MQEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("amazonMqClient", com.amazonaws.services.mq.AmazonMQ.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.mq.MQOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MQEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         MQEndpoint target = (MQEndpoint) obj;
@@ -66,15 +47,6 @@ public class MQEndpointConfigurer extends PropertyConfigurerSupport implements G
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKComponentConfigurer.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKComponentConfigurer.java
index 4da6d00..e6e8067 100644
--- a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKComponentConfigurer.java
+++ b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.msk;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,25 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class MSKComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("configuration", org.apache.camel.component.aws.msk.MSKConfiguration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("mskClient", com.amazonaws.services.kafka.AWSKafka.class);
-        map.put("operation", org.apache.camel.component.aws.msk.MSKOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MSKComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.msk.MSKConfiguration getOrCreateConfiguration(MSKComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.msk.MSKConfiguration());
@@ -72,15 +54,6 @@ public class MSKComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointConfigurer.java b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointConfigurer.java
index f93071f..f462f92 100644
--- a/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointConfigurer.java
+++ b/components/camel-aws-msk/src/generated/java/org/apache/camel/component/aws/msk/MSKEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.msk;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class MSKEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("mskClient", com.amazonaws.services.kafka.AWSKafka.class);
-        map.put("operation", org.apache.camel.component.aws.msk.MSKOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MSKEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         MSKEndpoint target = (MSKEndpoint) obj;
@@ -66,15 +47,6 @@ public class MSKEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3ComponentConfigurer.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3ComponentConfigurer.java
index 61e55d6..a4f07ed 100644
--- a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3ComponentConfigurer.java
+++ b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.s3;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,52 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class S3ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonS3Client", com.amazonaws.services.s3.AmazonS3.class);
-        map.put("autoCreateBucket", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.s3.S3Configuration.class);
-        map.put("endpointConfiguration", com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration.class);
-        map.put("pathStyleAccess", boolean.class);
-        map.put("policy", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("useIAMCredentials", boolean.class);
-        map.put("encryptionMaterials", com.amazonaws.services.s3.model.EncryptionMaterials.class);
-        map.put("useEncryption", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("deleteAfterRead", boolean.class);
-        map.put("delimiter", java.lang.String.class);
-        map.put("fileName", java.lang.String.class);
-        map.put("includeBody", boolean.class);
-        map.put("prefix", java.lang.String.class);
-        map.put("autocloseBody", boolean.class);
-        map.put("deleteAfterWrite", boolean.class);
-        map.put("keyName", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("multiPartUpload", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.s3.S3Operations.class);
-        map.put("partSize", long.class);
-        map.put("serverSideEncryption", java.lang.String.class);
-        map.put("storageClass", java.lang.String.class);
-        map.put("awsKMSKeyId", java.lang.String.class);
-        map.put("useAwsKMS", boolean.class);
-        map.put("accelerateModeEnabled", boolean.class);
-        map.put("chunkedEncodingDisabled", boolean.class);
-        map.put("dualstackEnabled", boolean.class);
-        map.put("forceGlobalBucketAccessEnabled", boolean.class);
-        map.put("payloadSigningEnabled", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(S3ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.s3.S3Configuration getOrCreateConfiguration(S3Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.s3.S3Configuration());
@@ -150,15 +105,6 @@ public class S3ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "acceleratemodeenabled":
diff --git a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointConfigurer.java b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointConfigurer.java
index a125a8a..cbec481 100644
--- a/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointConfigurer.java
+++ b/components/camel-aws-s3/src/generated/java/org/apache/camel/component/aws/s3/S3EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.s3;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,73 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class S3EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("bucketNameOrArn", java.lang.String.class);
-        map.put("amazonS3Client", com.amazonaws.services.s3.AmazonS3.class);
-        map.put("autoCreateBucket", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("endpointConfiguration", com.amazonaws.client.builder.AwsClientBuilder.EndpointConfiguration.class);
-        map.put("pathStyleAccess", boolean.class);
-        map.put("policy", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("useIAMCredentials", boolean.class);
-        map.put("encryptionMaterials", com.amazonaws.services.s3.model.EncryptionMaterials.class);
-        map.put("useEncryption", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("deleteAfterRead", boolean.class);
-        map.put("delimiter", java.lang.String.class);
-        map.put("fileName", java.lang.String.class);
-        map.put("includeBody", boolean.class);
-        map.put("maxConnections", int.class);
-        map.put("maxMessagesPerPoll", int.class);
-        map.put("prefix", java.lang.String.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("autocloseBody", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("deleteAfterWrite", boolean.class);
-        map.put("keyName", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("multiPartUpload", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.s3.S3Operations.class);
-        map.put("partSize", long.class);
-        map.put("serverSideEncryption", java.lang.String.class);
-        map.put("storageClass", java.lang.String.class);
-        map.put("awsKMSKeyId", java.lang.String.class);
-        map.put("useAwsKMS", boolean.class);
-        map.put("accelerateModeEnabled", boolean.class);
-        map.put("chunkedEncodingDisabled", boolean.class);
-        map.put("dualstackEnabled", boolean.class);
-        map.put("forceGlobalBucketAccessEnabled", boolean.class);
-        map.put("payloadSigningEnabled", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(S3EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         S3Endpoint target = (S3Endpoint) obj;
@@ -201,15 +135,6 @@ public class S3EndpointConfigurer extends PropertyConfigurerSupport implements G
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "acceleratemodeenabled":
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java
index 94ecf85..157bbe2 100644
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java
+++ b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.sdb;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,15 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SdbComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SdbComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         SdbComponent target = (SdbComponent) obj;
@@ -38,15 +30,6 @@ public class SdbComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java
index 0cfa357..4610e8f 100644
--- a/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java
+++ b/components/camel-aws-sdb/src/generated/java/org/apache/camel/component/aws/sdb/SdbEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.sdb;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SdbEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("domainName", java.lang.String.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("amazonSDBClient", com.amazonaws.services.simpledb.AmazonSimpleDB.class);
-        map.put("consistentRead", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("maxNumberOfDomains", java.lang.Integer.class);
-        map.put("operation", org.apache.camel.component.aws.sdb.SdbOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SdbEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         SdbEndpoint target = (SdbEndpoint) obj;
@@ -69,15 +49,6 @@ public class SdbEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesComponentConfigurer.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesComponentConfigurer.java
index a571872..0416cb1 100644
--- a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesComponentConfigurer.java
+++ b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ses;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SesComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonSESClient", com.amazonaws.services.simpleemail.AmazonSimpleEmailService.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.ses.SesConfiguration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("replyToAddresses", java.util.List.class);
-        map.put("returnPath", java.lang.String.class);
-        map.put("subject", java.lang.String.class);
-        map.put("to", java.util.List.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SesComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.ses.SesConfiguration getOrCreateConfiguration(SesComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.ses.SesConfiguration());
@@ -80,15 +59,6 @@ public class SesComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointConfigurer.java b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointConfigurer.java
index d88c4ae..ba81fae 100644
--- a/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointConfigurer.java
+++ b/components/camel-aws-ses/src/generated/java/org/apache/camel/component/aws/ses/SesEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.ses;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SesEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("from", java.lang.String.class);
-        map.put("amazonSESClient", com.amazonaws.services.simpleemail.AmazonSimpleEmailService.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("replyToAddresses", java.util.List.class);
-        map.put("returnPath", java.lang.String.class);
-        map.put("subject", java.lang.String.class);
-        map.put("to", java.util.List.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SesEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         SesEndpoint target = (SesEndpoint) obj;
@@ -74,15 +52,6 @@ public class SesEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsComponentConfigurer.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsComponentConfigurer.java
index 09f8456..994eadf 100644
--- a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsComponentConfigurer.java
+++ b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.sns;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,33 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SnsComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonSNSClient", com.amazonaws.services.sns.AmazonSNS.class);
-        map.put("amazonSQSClient", com.amazonaws.services.sqs.AmazonSQS.class);
-        map.put("autoCreateTopic", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.sns.SnsConfiguration.class);
-        map.put("kmsMasterKeyId", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageStructure", java.lang.String.class);
-        map.put("policy", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("queueUrl", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("serverSideEncryptionEnabled", boolean.class);
-        map.put("subject", java.lang.String.class);
-        map.put("subscribeSNStoSQS", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SnsComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.sns.SnsConfiguration getOrCreateConfiguration(SnsComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.sns.SnsConfiguration());
@@ -95,15 +69,6 @@ public class SnsComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointConfigurer.java b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointConfigurer.java
index 340bdda..4ddb52f 100644
--- a/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointConfigurer.java
+++ b/components/camel-aws-sns/src/generated/java/org/apache/camel/component/aws/sns/SnsEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.sns;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,35 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SnsEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("topicNameOrArn", java.lang.String.class);
-        map.put("amazonSNSClient", com.amazonaws.services.sns.AmazonSNS.class);
-        map.put("amazonSQSClient", com.amazonaws.services.sqs.AmazonSQS.class);
-        map.put("autoCreateTopic", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("kmsMasterKeyId", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageStructure", java.lang.String.class);
-        map.put("policy", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("queueUrl", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("serverSideEncryptionEnabled", boolean.class);
-        map.put("subject", java.lang.String.class);
-        map.put("subscribeSNStoSQS", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SnsEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         SnsEndpoint target = (SnsEndpoint) obj;
@@ -92,15 +64,6 @@ public class SnsEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurer.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurer.java
index 9c6da45..a9c55de 100644
--- a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurer.java
+++ b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.sqs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,52 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SqsComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonAWSHost", java.lang.String.class);
-        map.put("amazonSQSClient", com.amazonaws.services.sqs.AmazonSQS.class);
-        map.put("autoCreateQueue", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.sqs.SqsConfiguration.class);
-        map.put("protocol", java.lang.String.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("queueOwnerAWSAccountId", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("attributeNames", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("concurrentConsumers", int.class);
-        map.put("defaultVisibilityTimeout", java.lang.Integer.class);
-        map.put("deleteAfterRead", boolean.class);
-        map.put("deleteIfFiltered", boolean.class);
-        map.put("extendMessageVisibility", boolean.class);
-        map.put("kmsDataKeyReusePeriodSeconds", java.lang.Integer.class);
-        map.put("kmsMasterKeyId", java.lang.String.class);
-        map.put("messageAttributeNames", java.lang.String.class);
-        map.put("serverSideEncryptionEnabled", boolean.class);
-        map.put("visibilityTimeout", java.lang.Integer.class);
-        map.put("waitTimeSeconds", java.lang.Integer.class);
-        map.put("delaySeconds", java.lang.Integer.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageDeduplicationIdStrategy", java.lang.String.class);
-        map.put("messageGroupIdStrategy", java.lang.String.class);
-        map.put("operation", org.apache.camel.component.aws.sqs.SqsOperations.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("delayQueue", boolean.class);
-        map.put("queueUrl", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("maximumMessageSize", java.lang.Integer.class);
-        map.put("messageRetentionPeriod", java.lang.Integer.class);
-        map.put("policy", java.lang.String.class);
-        map.put("receiveMessageWaitTimeSeconds", java.lang.Integer.class);
-        map.put("redrivePolicy", java.lang.String.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SqsComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.sqs.SqsConfiguration getOrCreateConfiguration(SqsComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.sqs.SqsConfiguration());
@@ -151,15 +106,6 @@ public class SqsComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointConfigurer.java b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointConfigurer.java
index a40e45b..e72177c 100644
--- a/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointConfigurer.java
+++ b/components/camel-aws-sqs/src/generated/java/org/apache/camel/component/aws/sqs/SqsEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.sqs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,73 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SqsEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("queueNameOrArn", java.lang.String.class);
-        map.put("amazonAWSHost", java.lang.String.class);
-        map.put("amazonSQSClient", com.amazonaws.services.sqs.AmazonSQS.class);
-        map.put("autoCreateQueue", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("protocol", java.lang.String.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("queueOwnerAWSAccountId", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("attributeNames", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("concurrentConsumers", int.class);
-        map.put("defaultVisibilityTimeout", java.lang.Integer.class);
-        map.put("deleteAfterRead", boolean.class);
-        map.put("deleteIfFiltered", boolean.class);
-        map.put("extendMessageVisibility", boolean.class);
-        map.put("kmsDataKeyReusePeriodSeconds", java.lang.Integer.class);
-        map.put("kmsMasterKeyId", java.lang.String.class);
-        map.put("maxMessagesPerPoll", int.class);
-        map.put("messageAttributeNames", java.lang.String.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("serverSideEncryptionEnabled", boolean.class);
-        map.put("visibilityTimeout", java.lang.Integer.class);
-        map.put("waitTimeSeconds", java.lang.Integer.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("delaySeconds", java.lang.Integer.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageDeduplicationIdStrategy", java.lang.String.class);
-        map.put("messageGroupIdStrategy", java.lang.String.class);
-        map.put("operation", org.apache.camel.component.aws.sqs.SqsOperations.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("delayQueue", boolean.class);
-        map.put("queueUrl", java.lang.String.class);
-        map.put("synchronous", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("maximumMessageSize", java.lang.Integer.class);
-        map.put("messageRetentionPeriod", java.lang.Integer.class);
-        map.put("policy", java.lang.String.class);
-        map.put("receiveMessageWaitTimeSeconds", java.lang.Integer.class);
-        map.put("redrivePolicy", java.lang.String.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SqsEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         SqsEndpoint target = (SqsEndpoint) obj;
@@ -202,15 +136,6 @@ public class SqsEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFComponentConfigurer.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFComponentConfigurer.java
index c6673cc..7106e3d 100644
--- a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFComponentConfigurer.java
+++ b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.swf;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,43 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SWFComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonSWClient", com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow.class);
-        map.put("configuration", org.apache.camel.component.aws.swf.SWFConfiguration.class);
-        map.put("dataConverter", com.amazonaws.services.simpleworkflow.flow.DataConverter.class);
-        map.put("domainName", java.lang.String.class);
-        map.put("eventName", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("version", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("activityList", java.lang.String.class);
-        map.put("activitySchedulingOptions", com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions.class);
-        map.put("activityThreadPoolSize", int.class);
-        map.put("activityTypeExecutionOptions", com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions.class);
-        map.put("activityTypeRegistrationOptions", com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("clientConfigurationParameters", java.util.Map.class);
-        map.put("startWorkflowOptionsParameters", java.util.Map.class);
-        map.put("sWClientParameters", java.util.Map.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("childPolicy", java.lang.String.class);
-        map.put("executionStartToCloseTimeout", java.lang.String.class);
-        map.put("operation", java.lang.String.class);
-        map.put("signalName", java.lang.String.class);
-        map.put("stateResultType", java.lang.String.class);
-        map.put("taskStartToCloseTimeout", java.lang.String.class);
-        map.put("terminationDetails", java.lang.String.class);
-        map.put("terminationReason", java.lang.String.class);
-        map.put("workflowList", java.lang.String.class);
-        map.put("workflowTypeRegistrationOptions", com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SWFComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.swf.SWFConfiguration getOrCreateConfiguration(SWFComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.swf.SWFConfiguration());
@@ -125,15 +89,6 @@ public class SWFComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointConfigurer.java b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointConfigurer.java
index 464fa29..a091658 100644
--- a/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointConfigurer.java
+++ b/components/camel-aws-swf/src/generated/java/org/apache/camel/component/aws/swf/SWFEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.swf;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,46 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class SWFEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("type", java.lang.String.class);
-        map.put("amazonSWClient", com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflow.class);
-        map.put("dataConverter", com.amazonaws.services.simpleworkflow.flow.DataConverter.class);
-        map.put("domainName", java.lang.String.class);
-        map.put("eventName", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("version", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("activityList", java.lang.String.class);
-        map.put("activitySchedulingOptions", com.amazonaws.services.simpleworkflow.flow.ActivitySchedulingOptions.class);
-        map.put("activityThreadPoolSize", int.class);
-        map.put("activityTypeExecutionOptions", com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeExecutionOptions.class);
-        map.put("activityTypeRegistrationOptions", com.amazonaws.services.simpleworkflow.flow.worker.ActivityTypeRegistrationOptions.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("clientConfigurationParameters", java.util.Map.class);
-        map.put("startWorkflowOptionsParameters", java.util.Map.class);
-        map.put("sWClientParameters", java.util.Map.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("childPolicy", java.lang.String.class);
-        map.put("executionStartToCloseTimeout", java.lang.String.class);
-        map.put("operation", java.lang.String.class);
-        map.put("signalName", java.lang.String.class);
-        map.put("stateResultType", java.lang.String.class);
-        map.put("taskStartToCloseTimeout", java.lang.String.class);
-        map.put("terminationDetails", java.lang.String.class);
-        map.put("terminationReason", java.lang.String.class);
-        map.put("workflowList", java.lang.String.class);
-        map.put("workflowTypeRegistrationOptions", com.amazonaws.services.simpleworkflow.flow.WorkflowTypeRegistrationOptions.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(SWFEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         SWFEndpoint target = (SWFEndpoint) obj;
@@ -125,15 +86,6 @@ public class SWFEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateComponentConfigurer.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateComponentConfigurer.java
index d624771..f2485fd 100644
--- a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateComponentConfigurer.java
+++ b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.translate;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class TranslateComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("autodetectSourceLanguage", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws.translate.TranslateConfiguration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.translate.TranslateOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("sourceLanguage", java.lang.String.class);
-        map.put("targetLanguage", java.lang.String.class);
-        map.put("translateClient", com.amazonaws.services.translate.AmazonTranslate.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(TranslateComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws.translate.TranslateConfiguration getOrCreateConfiguration(TranslateComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws.translate.TranslateConfiguration());
@@ -81,15 +60,6 @@ public class TranslateComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointConfigurer.java b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointConfigurer.java
index 1b1b952..2a851fa 100644
--- a/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointConfigurer.java
+++ b/components/camel-aws-translate/src/generated/java/org/apache/camel/component/aws/translate/TranslateEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws.translate;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class TranslateEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("autodetectSourceLanguage", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws.translate.TranslateOperations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", com.amazonaws.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("sourceLanguage", java.lang.String.class);
-        map.put("targetLanguage", java.lang.String.class);
-        map.put("translateClient", com.amazonaws.services.translate.AmazonTranslate.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(TranslateEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         TranslateEndpoint target = (TranslateEndpoint) obj;
@@ -75,15 +53,6 @@ public class TranslateEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java
index 83bd374..6fe998e 100644
--- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java
+++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.athena;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,43 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Athena2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("accessKey", java.lang.String.class);
-        map.put("amazonAthenaClient", software.amazon.awssdk.services.athena.AthenaClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.athena.Athena2Configuration.class);
-        map.put("database", java.lang.String.class);
-        map.put("delay", long.class);
-        map.put("encryptionOption", software.amazon.awssdk.services.athena.model.EncryptionOption.class);
-        map.put("includeTrace", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("kmsKey", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("maxAttempts", int.class);
-        map.put("maxResults", java.lang.Integer.class);
-        map.put("nextToken", java.lang.String.class);
-        map.put("operation", org.apache.camel.component.aws2.athena.Athena2Operations.class);
-        map.put("outputLocation", java.lang.String.class);
-        map.put("outputType", org.apache.camel.component.aws2.athena.Athena2OutputType.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("queryExecutionId", java.lang.String.class);
-        map.put("queryString", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("resetWaitTimeoutOnRetry", boolean.class);
-        map.put("retry", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("waitTimeout", long.class);
-        map.put("workGroup", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("clientRequestToken", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Athena2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.athena.Athena2Configuration getOrCreateConfiguration(Athena2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.athena.Athena2Configuration());
@@ -123,15 +87,6 @@ public class Athena2ComponentConfigurer extends PropertyConfigurerSupport implem
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java
index 8f67c5f..bfd99ea 100644
--- a/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java
+++ b/components/camel-aws2-athena/src/generated/java/org/apache/camel/component/aws2/athena/Athena2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.athena;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,44 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Athena2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("amazonAthenaClient", software.amazon.awssdk.services.athena.AthenaClient.class);
-        map.put("database", java.lang.String.class);
-        map.put("delay", long.class);
-        map.put("encryptionOption", software.amazon.awssdk.services.athena.model.EncryptionOption.class);
-        map.put("includeTrace", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("kmsKey", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("maxAttempts", int.class);
-        map.put("maxResults", java.lang.Integer.class);
-        map.put("nextToken", java.lang.String.class);
-        map.put("operation", org.apache.camel.component.aws2.athena.Athena2Operations.class);
-        map.put("outputLocation", java.lang.String.class);
-        map.put("outputType", org.apache.camel.component.aws2.athena.Athena2OutputType.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("queryExecutionId", java.lang.String.class);
-        map.put("queryString", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("resetWaitTimeoutOnRetry", boolean.class);
-        map.put("retry", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("waitTimeout", long.class);
-        map.put("workGroup", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("clientRequestToken", java.lang.String.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Athena2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Athena2Endpoint target = (Athena2Endpoint) obj;
@@ -117,15 +80,6 @@ public class Athena2EndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
index 150b8e7..5d02ae7 100644
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.cw;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Cw2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonCwClient", software.amazon.awssdk.services.cloudwatch.CloudWatchClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.cw.Cw2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("name", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("timestamp", java.time.Instant.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("unit", java.lang.String.class);
-        map.put("value", java.lang.Double.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Cw2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.cw.Cw2Configuration getOrCreateConfiguration(Cw2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.cw.Cw2Configuration());
@@ -81,15 +59,6 @@ public class Cw2ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
index 33da397..2e49e74 100644
--- a/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
+++ b/components/camel-aws2-cw/src/generated/java/org/apache/camel/component/aws2/cw/Cw2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.cw;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,30 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Cw2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("namespace", java.lang.String.class);
-        map.put("amazonCwClient", software.amazon.awssdk.services.cloudwatch.CloudWatchClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("name", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("timestamp", java.time.Instant.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("unit", java.lang.String.class);
-        map.put("value", java.lang.Double.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Cw2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Cw2Endpoint target = (Cw2Endpoint) obj;
@@ -75,15 +52,6 @@ public class Cw2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2ComponentConfigurer.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2ComponentConfigurer.java
index 1491179..dbd9078 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2ComponentConfigurer.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ddb;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,31 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Ddb2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonDDBClient", software.amazon.awssdk.services.dynamodb.DynamoDbClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.ddb.Ddb2Configuration.class);
-        map.put("consistentRead", boolean.class);
-        map.put("keyAttributeName", java.lang.String.class);
-        map.put("keyAttributeType", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.ddb.Ddb2Operations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("readCapacity", java.lang.Long.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("writeCapacity", java.lang.Long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Ddb2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.ddb.Ddb2Configuration getOrCreateConfiguration(Ddb2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.ddb.Ddb2Configuration());
@@ -90,15 +66,6 @@ public class Ddb2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointConfigurer.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointConfigurer.java
index 6e8f66b..eb3b9bd 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointConfigurer.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddb/Ddb2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ddb;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,32 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Ddb2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("tableName", java.lang.String.class);
-        map.put("amazonDDBClient", software.amazon.awssdk.services.dynamodb.DynamoDbClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("consistentRead", boolean.class);
-        map.put("keyAttributeName", java.lang.String.class);
-        map.put("keyAttributeType", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.ddb.Ddb2Operations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("readCapacity", java.lang.Long.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("writeCapacity", java.lang.Long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Ddb2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Ddb2Endpoint target = (Ddb2Endpoint) obj;
@@ -84,15 +59,6 @@ public class Ddb2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamComponentConfigurer.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamComponentConfigurer.java
index 24ec60e..039d515 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamComponentConfigurer.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ddbstream;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Ddb2StreamComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("amazonDynamoDbStreamsClient", software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration.class);
-        map.put("iteratorType", software.amazon.awssdk.services.dynamodb.model.ShardIteratorType.class);
-        map.put("maxResultsPerRequest", int.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("sequenceNumberProvider", org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Ddb2StreamComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration getOrCreateConfiguration(Ddb2StreamComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.ddbstream.Ddb2StreamConfiguration());
@@ -82,15 +61,6 @@ public class Ddb2StreamComponentConfigurer extends PropertyConfigurerSupport imp
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointConfigurer.java b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointConfigurer.java
index 55749d0..04d217b 100644
--- a/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointConfigurer.java
+++ b/components/camel-aws2-ddb/src/generated/java/org/apache/camel/component/aws2/ddbstream/Ddb2StreamEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ddbstream;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,47 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Ddb2StreamEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("tableName", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("amazonDynamoDbStreamsClient", software.amazon.awssdk.services.dynamodb.streams.DynamoDbStreamsClient.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("iteratorType", software.amazon.awssdk.services.dynamodb.model.ShardIteratorType.class);
-        map.put("maxResultsPerRequest", int.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("sequenceNumberProvider", org.apache.camel.component.aws2.ddbstream.SequenceNumberProvider.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Ddb2StreamEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Ddb2StreamEndpoint target = (Ddb2StreamEndpoint) obj;
@@ -127,15 +87,6 @@ public class Ddb2StreamEndpointConfigurer extends PropertyConfigurerSupport impl
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2ComponentConfigurer.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2ComponentConfigurer.java
index 3c2847f..fc211cf 100644
--- a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2ComponentConfigurer.java
+++ b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ec2;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AWS2EC2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("amazonEc2Client", software.amazon.awssdk.services.ec2.Ec2Client.class);
-        map.put("configuration", org.apache.camel.component.aws2.ec2.AWS2EC2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.ec2.AWS2EC2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AWS2EC2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.ec2.AWS2EC2Configuration getOrCreateConfiguration(AWS2EC2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.ec2.AWS2EC2Configuration());
@@ -78,15 +58,6 @@ public class AWS2EC2ComponentConfigurer extends PropertyConfigurerSupport implem
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointConfigurer.java b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointConfigurer.java
index 83e2ffc..8339ea5 100644
--- a/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointConfigurer.java
+++ b/components/camel-aws2-ec2/src/generated/java/org/apache/camel/component/aws2/ec2/AWS2EC2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ec2;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AWS2EC2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("amazonEc2Client", software.amazon.awssdk.services.ec2.Ec2Client.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.ec2.AWS2EC2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AWS2EC2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AWS2EC2Endpoint target = (AWS2EC2Endpoint) obj;
@@ -72,15 +51,6 @@ public class AWS2EC2EndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurer.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurer.java
index 231efdc..721e970 100644
--- a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurer.java
+++ b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ecs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class ECS2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.ecs.ECS2Configuration.class);
-        map.put("ecsClient", software.amazon.awssdk.services.ecs.EcsClient.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.ecs.ECS2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ECS2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.ecs.ECS2Configuration getOrCreateConfiguration(ECS2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.ecs.ECS2Configuration());
@@ -78,15 +58,6 @@ public class ECS2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointConfigurer.java b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointConfigurer.java
index 1d9d77d..463d9d6 100644
--- a/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointConfigurer.java
+++ b/components/camel-aws2-ecs/src/generated/java/org/apache/camel/component/aws2/ecs/ECS2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ecs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class ECS2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("ecsClient", software.amazon.awssdk.services.ecs.EcsClient.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.ecs.ECS2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(ECS2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         ECS2Endpoint target = (ECS2Endpoint) obj;
@@ -72,15 +51,6 @@ public class ECS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurer.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurer.java
index f92eaae..cf94976 100644
--- a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurer.java
+++ b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.eks;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EKS2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.eks.EKS2Configuration.class);
-        map.put("eksClient", software.amazon.awssdk.services.eks.EksClient.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.eks.EKS2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EKS2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.eks.EKS2Configuration getOrCreateConfiguration(EKS2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.eks.EKS2Configuration());
@@ -78,15 +58,6 @@ public class EKS2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointConfigurer.java b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointConfigurer.java
index f732d6e..a2507c4 100644
--- a/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointConfigurer.java
+++ b/components/camel-aws2-eks/src/generated/java/org/apache/camel/component/aws2/eks/EKS2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.eks;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EKS2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("eksClient", software.amazon.awssdk.services.eks.EksClient.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.eks.EKS2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EKS2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         EKS2Endpoint target = (EKS2Endpoint) obj;
@@ -72,15 +51,6 @@ public class EKS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurer.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurer.java
index 8d368f5..8ba9127 100644
--- a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurer.java
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.eventbridge;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EventbridgeComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration.class);
-        map.put("eventbridgeClient", software.amazon.awssdk.services.eventbridge.EventBridgeClient.class);
-        map.put("eventPatternFile", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.eventbridge.EventbridgeOperations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EventbridgeComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration getOrCreateConfiguration(EventbridgeComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.eventbridge.EventbridgeConfiguration());
@@ -81,15 +60,6 @@ public class EventbridgeComponentConfigurer extends PropertyConfigurerSupport im
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointConfigurer.java b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointConfigurer.java
index b0880ca..984c5da 100644
--- a/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointConfigurer.java
+++ b/components/camel-aws2-eventbridge/src/generated/java/org/apache/camel/component/aws2/eventbridge/EventbridgeEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.eventbridge;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EventbridgeEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("eventbusNameOrArn", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("eventbridgeClient", software.amazon.awssdk.services.eventbridge.EventBridgeClient.class);
-        map.put("eventPatternFile", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.eventbridge.EventbridgeOperations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EventbridgeEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         EventbridgeEndpoint target = (EventbridgeEndpoint) obj;
@@ -75,15 +53,6 @@ public class EventbridgeEndpointConfigurer extends PropertyConfigurerSupport imp
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2ComponentConfigurer.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2ComponentConfigurer.java
index 17a4dcb..0c97caa 100644
--- a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2ComponentConfigurer.java
+++ b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.iam;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class IAM2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.iam.IAM2Configuration.class);
-        map.put("iamClient", software.amazon.awssdk.services.iam.IamClient.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.iam.IAM2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(IAM2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.iam.IAM2Configuration getOrCreateConfiguration(IAM2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.iam.IAM2Configuration());
@@ -78,15 +58,6 @@ public class IAM2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointConfigurer.java b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointConfigurer.java
index 552789f..4a5b32a 100644
--- a/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointConfigurer.java
+++ b/components/camel-aws2-iam/src/generated/java/org/apache/camel/component/aws2/iam/IAM2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.iam;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class IAM2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("iamClient", software.amazon.awssdk.services.iam.IamClient.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.iam.IAM2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(IAM2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         IAM2Endpoint target = (IAM2Endpoint) obj;
@@ -72,15 +51,6 @@ public class IAM2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
index eeae899..f24025e 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.firehose;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KinesisFirehose2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonKinesisFirehoseClient", software.amazon.awssdk.services.firehose.FirehoseClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("cborEnabled", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisFirehose2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration getOrCreateConfiguration(KinesisFirehose2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration());
@@ -78,15 +58,6 @@ public class KinesisFirehose2ComponentConfigurer extends PropertyConfigurerSuppo
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
index a9f1700..c1288f2 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/firehose/KinesisFirehose2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.firehose;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KinesisFirehose2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("streamName", java.lang.String.class);
-        map.put("amazonKinesisFirehoseClient", software.amazon.awssdk.services.firehose.FirehoseClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("cborEnabled", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KinesisFirehose2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KinesisFirehose2Endpoint target = (KinesisFirehose2Endpoint) obj;
@@ -72,15 +51,6 @@ public class KinesisFirehose2EndpointConfigurer extends PropertyConfigurerSuppor
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java
index 8dc413c..c1c3982 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.kinesis;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,32 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonKinesisClient", software.amazon.awssdk.services.kinesis.KinesisClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("cborEnabled", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.kinesis.Kinesis2Configuration.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("iteratorType", software.amazon.awssdk.services.kinesis.model.ShardIteratorType.class);
-        map.put("maxResultsPerRequest", int.class);
-        map.put("sequenceNumber", java.lang.String.class);
-        map.put("shardClosed", org.apache.camel.component.aws2.kinesis.Kinesis2ShardClosedStrategyEnum.class);
-        map.put("shardId", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Kinesis2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.kinesis.Kinesis2Configuration getOrCreateConfiguration(Kinesis2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.kinesis.Kinesis2Configuration());
@@ -94,15 +69,6 @@ public class Kinesis2ComponentConfigurer extends PropertyConfigurerSupport imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java
index 1ed4eeb..af13ffa 100644
--- a/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java
+++ b/components/camel-aws2-kinesis/src/generated/java/org/apache/camel/component/aws2/kinesis/Kinesis2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.kinesis;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,51 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("streamName", java.lang.String.class);
-        map.put("amazonKinesisClient", software.amazon.awssdk.services.kinesis.KinesisClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("cborEnabled", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("iteratorType", software.amazon.awssdk.services.kinesis.model.ShardIteratorType.class);
-        map.put("maxResultsPerRequest", int.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("sequenceNumber", java.lang.String.class);
-        map.put("shardClosed", org.apache.camel.component.aws2.kinesis.Kinesis2ShardClosedStrategyEnum.class);
-        map.put("shardId", java.lang.String.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Kinesis2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Kinesis2Endpoint target = (Kinesis2Endpoint) obj;
@@ -139,15 +95,6 @@ public class Kinesis2EndpointConfigurer extends PropertyConfigurerSupport implem
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
index 8dca088..cebe31f 100644
--- a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
+++ b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.kms;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KMS2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.kms.KMS2Configuration.class);
-        map.put("kmsClient", software.amazon.awssdk.services.kms.KmsClient.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.kms.KMS2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KMS2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.kms.KMS2Configuration getOrCreateConfiguration(KMS2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.kms.KMS2Configuration());
@@ -78,15 +58,6 @@ public class KMS2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
index d5028f1..f1f5f16 100644
--- a/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
+++ b/components/camel-aws2-kms/src/generated/java/org/apache/camel/component/aws2/kms/KMS2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.kms;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KMS2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("kmsClient", software.amazon.awssdk.services.kms.KmsClient.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.kms.KMS2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(KMS2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KMS2Endpoint target = (KMS2Endpoint) obj;
@@ -72,15 +51,6 @@ public class KMS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentConfigurer.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentConfigurer.java
index a3a8cc7..bda8ba5 100644
--- a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentConfigurer.java
+++ b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.lambda;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Lambda2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.lambda.Lambda2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.lambda.Lambda2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("awsLambdaClient", software.amazon.awssdk.services.lambda.LambdaClient.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Lambda2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.lambda.Lambda2Configuration getOrCreateConfiguration(Lambda2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.lambda.Lambda2Configuration());
@@ -78,15 +58,6 @@ public class Lambda2ComponentConfigurer extends PropertyConfigurerSupport implem
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointConfigurer.java b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointConfigurer.java
index 741549f..503a393 100644
--- a/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointConfigurer.java
+++ b/components/camel-aws2-lambda/src/generated/java/org/apache/camel/component/aws2/lambda/Lambda2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.lambda;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Lambda2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("function", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.lambda.Lambda2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("awsLambdaClient", software.amazon.awssdk.services.lambda.LambdaClient.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Lambda2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Lambda2Endpoint target = (Lambda2Endpoint) obj;
@@ -72,15 +51,6 @@ public class Lambda2EndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2ComponentConfigurer.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2ComponentConfigurer.java
index 85a72a4..52c0464 100644
--- a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2ComponentConfigurer.java
+++ b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.mq;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class MQ2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonMqClient", software.amazon.awssdk.services.mq.MqClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.mq.MQ2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.mq.MQ2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MQ2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.mq.MQ2Configuration getOrCreateConfiguration(MQ2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.mq.MQ2Configuration());
@@ -78,15 +58,6 @@ public class MQ2ComponentConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointConfigurer.java b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointConfigurer.java
index 45f5714..4683ade 100644
--- a/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointConfigurer.java
+++ b/components/camel-aws2-mq/src/generated/java/org/apache/camel/component/aws2/mq/MQ2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.mq;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class MQ2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("amazonMqClient", software.amazon.awssdk.services.mq.MqClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.mq.MQ2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MQ2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         MQ2Endpoint target = (MQ2Endpoint) obj;
@@ -72,15 +51,6 @@ public class MQ2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2ComponentConfigurer.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2ComponentConfigurer.java
index ca9e63d..9e199b6 100644
--- a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2ComponentConfigurer.java
+++ b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.msk;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class MSK2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.msk.MSK2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("mskClient", software.amazon.awssdk.services.kafka.KafkaClient.class);
-        map.put("operation", org.apache.camel.component.aws2.msk.MSK2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MSK2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.msk.MSK2Configuration getOrCreateConfiguration(MSK2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.msk.MSK2Configuration());
@@ -78,15 +58,6 @@ public class MSK2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointConfigurer.java b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointConfigurer.java
index 63cd10d..991810a 100644
--- a/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointConfigurer.java
+++ b/components/camel-aws2-msk/src/generated/java/org/apache/camel/component/aws2/msk/MSK2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.msk;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class MSK2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("mskClient", software.amazon.awssdk.services.kafka.KafkaClient.class);
-        map.put("operation", org.apache.camel.component.aws2.msk.MSK2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(MSK2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         MSK2Endpoint target = (MSK2Endpoint) obj;
@@ -72,15 +51,6 @@ public class MSK2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java
index 84096a2..0d45e6e 100644
--- a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java
+++ b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.s3;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,55 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AWS2S3ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonS3Client", software.amazon.awssdk.services.s3.S3Client.class);
-        map.put("autoCreateBucket", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.s3.AWS2S3Configuration.class);
-        map.put("overrideEndpoint", boolean.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("policy", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("uriEndpointOverride", java.lang.String.class);
-        map.put("useIAMCredentials", boolean.class);
-        map.put("customerAlgorithm", java.lang.String.class);
-        map.put("customerKeyId", java.lang.String.class);
-        map.put("customerKeyMD5", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("deleteAfterRead", boolean.class);
-        map.put("delimiter", java.lang.String.class);
-        map.put("destinationBucket", java.lang.String.class);
-        map.put("destinationBucketPrefix", java.lang.String.class);
-        map.put("destinationBucketSuffix", java.lang.String.class);
-        map.put("fileName", java.lang.String.class);
-        map.put("includeBody", boolean.class);
-        map.put("includeFolders", boolean.class);
-        map.put("moveAfterRead", boolean.class);
-        map.put("prefix", java.lang.String.class);
-        map.put("autocloseBody", boolean.class);
-        map.put("deleteAfterWrite", boolean.class);
-        map.put("keyName", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("multiPartUpload", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.s3.AWS2S3Operations.class);
-        map.put("partSize", long.class);
-        map.put("storageClass", java.lang.String.class);
-        map.put("awsKMSKeyId", java.lang.String.class);
-        map.put("useAwsKMS", boolean.class);
-        map.put("useCustomerKey", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AWS2S3ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.s3.AWS2S3Configuration getOrCreateConfiguration(AWS2S3Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.s3.AWS2S3Configuration());
@@ -159,15 +111,6 @@ public class AWS2S3ComponentConfigurer extends PropertyConfigurerSupport impleme
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java
index 1eff936..e42d0e8 100644
--- a/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java
+++ b/components/camel-aws2-s3/src/generated/java/org/apache/camel/component/aws2/s3/AWS2S3EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.s3;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,76 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class AWS2S3EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("bucketNameOrArn", java.lang.String.class);
-        map.put("amazonS3Client", software.amazon.awssdk.services.s3.S3Client.class);
-        map.put("autoCreateBucket", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("overrideEndpoint", boolean.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("policy", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("uriEndpointOverride", java.lang.String.class);
-        map.put("useIAMCredentials", boolean.class);
-        map.put("customerAlgorithm", java.lang.String.class);
-        map.put("customerKeyId", java.lang.String.class);
-        map.put("customerKeyMD5", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("deleteAfterRead", boolean.class);
-        map.put("delimiter", java.lang.String.class);
-        map.put("destinationBucket", java.lang.String.class);
-        map.put("destinationBucketPrefix", java.lang.String.class);
-        map.put("destinationBucketSuffix", java.lang.String.class);
-        map.put("fileName", java.lang.String.class);
-        map.put("includeBody", boolean.class);
-        map.put("includeFolders", boolean.class);
-        map.put("maxConnections", int.class);
-        map.put("maxMessagesPerPoll", int.class);
-        map.put("moveAfterRead", boolean.class);
-        map.put("prefix", java.lang.String.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("autocloseBody", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("deleteAfterWrite", boolean.class);
-        map.put("keyName", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("multiPartUpload", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.s3.AWS2S3Operations.class);
-        map.put("partSize", long.class);
-        map.put("storageClass", java.lang.String.class);
-        map.put("awsKMSKeyId", java.lang.String.class);
-        map.put("useAwsKMS", boolean.class);
-        map.put("useCustomerKey", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(AWS2S3EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         AWS2S3Endpoint target = (AWS2S3Endpoint) obj;
@@ -210,15 +141,6 @@ public class AWS2S3EndpointConfigurer extends PropertyConfigurerSupport implemen
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2ComponentConfigurer.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2ComponentConfigurer.java
index 17bce0f..e325934 100644
--- a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2ComponentConfigurer.java
+++ b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ses;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Ses2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonSESClient", software.amazon.awssdk.services.ses.SesClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.ses.Ses2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("replyToAddresses", java.util.List.class);
-        map.put("returnPath", java.lang.String.class);
-        map.put("subject", java.lang.String.class);
-        map.put("to", java.util.List.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Ses2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.ses.Ses2Configuration getOrCreateConfiguration(Ses2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.ses.Ses2Configuration());
@@ -83,15 +61,6 @@ public class Ses2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointConfigurer.java b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointConfigurer.java
index 3519dcd..af8819e 100644
--- a/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointConfigurer.java
+++ b/components/camel-aws2-ses/src/generated/java/org/apache/camel/component/aws2/ses/Ses2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.ses;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,30 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Ses2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("from", java.lang.String.class);
-        map.put("amazonSESClient", software.amazon.awssdk.services.ses.SesClient.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("replyToAddresses", java.util.List.class);
-        map.put("returnPath", java.lang.String.class);
-        map.put("subject", java.lang.String.class);
-        map.put("to", java.util.List.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Ses2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Ses2Endpoint target = (Ses2Endpoint) obj;
@@ -77,15 +54,6 @@ public class Ses2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java
index d64c483..2b0bac1 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.sns;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,33 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Sns2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonSNSClient", software.amazon.awssdk.services.sns.SnsClient.class);
-        map.put("autoCreateTopic", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.sns.Sns2Configuration.class);
-        map.put("kmsMasterKeyId", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageStructure", java.lang.String.class);
-        map.put("policy", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("queueUrl", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("serverSideEncryptionEnabled", boolean.class);
-        map.put("subject", java.lang.String.class);
-        map.put("subscribeSNStoSQS", boolean.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Sns2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.sns.Sns2Configuration getOrCreateConfiguration(Sns2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.sns.Sns2Configuration());
@@ -95,15 +69,6 @@ public class Sns2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java
index 78212a7..bd7a1d9 100644
--- a/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java
+++ b/components/camel-aws2-sns/src/generated/java/org/apache/camel/component/aws2/sns/Sns2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.sns;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,35 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Sns2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("topicNameOrArn", java.lang.String.class);
-        map.put("amazonSNSClient", software.amazon.awssdk.services.sns.SnsClient.class);
-        map.put("autoCreateTopic", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("kmsMasterKeyId", java.lang.String.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageStructure", java.lang.String.class);
-        map.put("policy", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("queueUrl", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("serverSideEncryptionEnabled", boolean.class);
-        map.put("subject", java.lang.String.class);
-        map.put("subscribeSNStoSQS", boolean.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Sns2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Sns2Endpoint target = (Sns2Endpoint) obj;
@@ -92,15 +64,6 @@ public class Sns2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentConfigurer.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentConfigurer.java
index a2a7dee..9e42237 100644
--- a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentConfigurer.java
+++ b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.sqs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,54 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Sqs2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amazonAWSHost", java.lang.String.class);
-        map.put("amazonSQSClient", software.amazon.awssdk.services.sqs.SqsClient.class);
-        map.put("autoCreateQueue", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.sqs.Sqs2Configuration.class);
-        map.put("protocol", java.lang.String.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("queueOwnerAWSAccountId", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("useIAMCredentials", boolean.class);
-        map.put("attributeNames", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("concurrentConsumers", int.class);
-        map.put("defaultVisibilityTimeout", java.lang.Integer.class);
-        map.put("deleteAfterRead", boolean.class);
-        map.put("deleteIfFiltered", boolean.class);
-        map.put("extendMessageVisibility", boolean.class);
-        map.put("kmsDataKeyReusePeriodSeconds", java.lang.Integer.class);
-        map.put("kmsMasterKeyId", java.lang.String.class);
-        map.put("messageAttributeNames", java.lang.String.class);
-        map.put("serverSideEncryptionEnabled", boolean.class);
-        map.put("visibilityTimeout", java.lang.Integer.class);
-        map.put("waitTimeSeconds", java.lang.Integer.class);
-        map.put("delaySeconds", java.lang.Integer.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageDeduplicationIdStrategy", java.lang.String.class);
-        map.put("messageGroupIdStrategy", java.lang.String.class);
-        map.put("operation", org.apache.camel.component.aws2.sqs.Sqs2Operations.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("delayQueue", boolean.class);
-        map.put("queueUrl", java.lang.String.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("maximumMessageSize", java.lang.Integer.class);
-        map.put("messageRetentionPeriod", java.lang.Integer.class);
-        map.put("policy", java.lang.String.class);
-        map.put("receiveMessageWaitTimeSeconds", java.lang.Integer.class);
-        map.put("redrivePolicy", java.lang.String.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Sqs2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.sqs.Sqs2Configuration getOrCreateConfiguration(Sqs2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.sqs.Sqs2Configuration());
@@ -157,15 +110,6 @@ public class Sqs2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointConfigurer.java b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointConfigurer.java
index 56333db..ce032b1 100644
--- a/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointConfigurer.java
+++ b/components/camel-aws2-sqs/src/generated/java/org/apache/camel/component/aws2/sqs/Sqs2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.sqs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,75 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Sqs2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("queueNameOrArn", java.lang.String.class);
-        map.put("amazonAWSHost", java.lang.String.class);
-        map.put("amazonSQSClient", software.amazon.awssdk.services.sqs.SqsClient.class);
-        map.put("autoCreateQueue", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("headerFilterStrategy", org.apache.camel.spi.HeaderFilterStrategy.class);
-        map.put("protocol", java.lang.String.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("queueOwnerAWSAccountId", java.lang.String.class);
-        map.put("region", java.lang.String.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("useIAMCredentials", boolean.class);
-        map.put("attributeNames", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("concurrentConsumers", int.class);
-        map.put("defaultVisibilityTimeout", java.lang.Integer.class);
-        map.put("deleteAfterRead", boolean.class);
-        map.put("deleteIfFiltered", boolean.class);
-        map.put("extendMessageVisibility", boolean.class);
-        map.put("kmsDataKeyReusePeriodSeconds", java.lang.Integer.class);
-        map.put("kmsMasterKeyId", java.lang.String.class);
-        map.put("maxMessagesPerPoll", int.class);
-        map.put("messageAttributeNames", java.lang.String.class);
-        map.put("sendEmptyMessageWhenIdle", boolean.class);
-        map.put("serverSideEncryptionEnabled", boolean.class);
-        map.put("visibilityTimeout", java.lang.Integer.class);
-        map.put("waitTimeSeconds", java.lang.Integer.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("pollStrategy", org.apache.camel.spi.PollingConsumerPollStrategy.class);
-        map.put("delaySeconds", java.lang.Integer.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageDeduplicationIdStrategy", java.lang.String.class);
-        map.put("messageGroupIdStrategy", java.lang.String.class);
-        map.put("operation", org.apache.camel.component.aws2.sqs.Sqs2Operations.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("delayQueue", boolean.class);
-        map.put("queueUrl", java.lang.String.class);
-        map.put("synchronous", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("maximumMessageSize", java.lang.Integer.class);
-        map.put("messageRetentionPeriod", java.lang.Integer.class);
-        map.put("policy", java.lang.String.class);
-        map.put("receiveMessageWaitTimeSeconds", java.lang.Integer.class);
-        map.put("redrivePolicy", java.lang.String.class);
-        map.put("backoffErrorThreshold", int.class);
-        map.put("backoffIdleThreshold", int.class);
-        map.put("backoffMultiplier", int.class);
-        map.put("delay", long.class);
-        map.put("greedy", boolean.class);
-        map.put("initialDelay", long.class);
-        map.put("repeatCount", long.class);
-        map.put("runLoggingLevel", org.apache.camel.LoggingLevel.class);
-        map.put("scheduledExecutorService", java.util.concurrent.ScheduledExecutorService.class);
-        map.put("scheduler", java.lang.Object.class);
-        map.put("schedulerProperties", java.util.Map.class);
-        map.put("startScheduler", boolean.class);
-        map.put("timeUnit", java.util.concurrent.TimeUnit.class);
-        map.put("useFixedDelay", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Sqs2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Sqs2Endpoint target = (Sqs2Endpoint) obj;
@@ -208,15 +140,6 @@ public class Sqs2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurer.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurer.java
index d880093..20e55e2 100644
--- a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurer.java
+++ b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.sts;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,27 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class STS2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.sts.STS2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.sts.STS2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("stsClient", software.amazon.awssdk.services.sts.StsClient.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(STS2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.sts.STS2Configuration getOrCreateConfiguration(STS2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.sts.STS2Configuration());
@@ -78,15 +58,6 @@ public class STS2ComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointConfigurer.java b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointConfigurer.java
index f3af500..79b55e3 100644
--- a/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointConfigurer.java
+++ b/components/camel-aws2-sts/src/generated/java/org/apache/camel/component/aws2/sts/STS2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.sts;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,28 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class STS2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.sts.STS2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("stsClient", software.amazon.awssdk.services.sts.StsClient.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(STS2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         STS2Endpoint target = (STS2Endpoint) obj;
@@ -72,15 +51,6 @@ public class STS2EndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2ComponentConfigurer.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2ComponentConfigurer.java
index 566261b..1b44864 100644
--- a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2ComponentConfigurer.java
+++ b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2ComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.translate;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,30 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Translate2ComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autodetectSourceLanguage", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.aws2.translate.Translate2Configuration.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.translate.Translate2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("sourceLanguage", java.lang.String.class);
-        map.put("targetLanguage", java.lang.String.class);
-        map.put("translateClient", software.amazon.awssdk.services.translate.TranslateClient.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Translate2ComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.aws2.translate.Translate2Configuration getOrCreateConfiguration(Translate2Component target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.aws2.translate.Translate2Configuration());
@@ -87,15 +64,6 @@ public class Translate2ComponentConfigurer extends PropertyConfigurerSupport imp
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointConfigurer.java b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointConfigurer.java
index 598909c..646842c 100644
--- a/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointConfigurer.java
+++ b/components/camel-aws2-translate/src/generated/java/org/apache/camel/component/aws2/translate/Translate2EndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.aws2.translate;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,31 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class Translate2EndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("autodetectSourceLanguage", boolean.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.aws2.translate.Translate2Operations.class);
-        map.put("pojoRequest", boolean.class);
-        map.put("proxyHost", java.lang.String.class);
-        map.put("proxyPort", java.lang.Integer.class);
-        map.put("proxyProtocol", software.amazon.awssdk.core.Protocol.class);
-        map.put("region", java.lang.String.class);
-        map.put("sourceLanguage", java.lang.String.class);
-        map.put("targetLanguage", java.lang.String.class);
-        map.put("translateClient", software.amazon.awssdk.services.translate.TranslateClient.class);
-        map.put("trustAllCertificates", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("secretKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(Translate2EndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         Translate2Endpoint target = (Translate2Endpoint) obj;
@@ -81,15 +57,6 @@ public class Translate2EndpointConfigurer extends PropertyConfigurerSupport impl
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
index 64372928..2e8de22 100644
--- a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
+++ b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.eventhubs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,34 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EventHubsComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("amqpRetryOptions", com.azure.core.amqp.AmqpRetryOptions.class);
-        map.put("amqpTransportType", com.azure.core.amqp.AmqpTransportType.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.azure.eventhubs.EventHubsConfiguration.class);
-        map.put("blobAccessKey", java.lang.String.class);
-        map.put("blobAccountName", java.lang.String.class);
-        map.put("blobContainerName", java.lang.String.class);
-        map.put("blobStorageSharedKeyCredential", com.azure.storage.common.StorageSharedKeyCredential.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("checkpointStore", com.azure.messaging.eventhubs.CheckpointStore.class);
-        map.put("consumerGroupName", java.lang.String.class);
-        map.put("eventPosition", java.util.Map.class);
-        map.put("prefetchCount", int.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("partitionId", java.lang.String.class);
-        map.put("partitionKey", java.lang.String.class);
-        map.put("producerAsyncClient", com.azure.messaging.eventhubs.EventHubProducerAsyncClient.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("connectionString", java.lang.String.class);
-        map.put("sharedAccessKey", java.lang.String.class);
-        map.put("sharedAccessName", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EventHubsComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.azure.eventhubs.EventHubsConfiguration getOrCreateConfiguration(EventHubsComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.azure.eventhubs.EventHubsConfiguration());
@@ -101,15 +74,6 @@ public class EventHubsComponentConfigurer extends PropertyConfigurerSupport impl
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "amqpretryoptions":
diff --git a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointConfigurer.java b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointConfigurer.java
index a68860d..c1b9e48 100644
--- a/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointConfigurer.java
+++ b/components/camel-azure-eventhubs/src/generated/java/org/apache/camel/component/azure/eventhubs/EventHubsEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.eventhubs;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,38 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class EventHubsEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("namespace", java.lang.String.class);
-        map.put("eventHubName", java.lang.String.class);
-        map.put("amqpRetryOptions", com.azure.core.amqp.AmqpRetryOptions.class);
-        map.put("amqpTransportType", com.azure.core.amqp.AmqpTransportType.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("blobAccessKey", java.lang.String.class);
-        map.put("blobAccountName", java.lang.String.class);
-        map.put("blobContainerName", java.lang.String.class);
-        map.put("blobStorageSharedKeyCredential", com.azure.storage.common.StorageSharedKeyCredential.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("checkpointStore", com.azure.messaging.eventhubs.CheckpointStore.class);
-        map.put("consumerGroupName", java.lang.String.class);
-        map.put("eventPosition", java.util.Map.class);
-        map.put("prefetchCount", int.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("partitionId", java.lang.String.class);
-        map.put("partitionKey", java.lang.String.class);
-        map.put("producerAsyncClient", com.azure.messaging.eventhubs.EventHubProducerAsyncClient.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("connectionString", java.lang.String.class);
-        map.put("sharedAccessKey", java.lang.String.class);
-        map.put("sharedAccessName", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(EventHubsEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         EventHubsEndpoint target = (EventHubsEndpoint) obj;
@@ -102,15 +71,6 @@ public class EventHubsEndpointConfigurer extends PropertyConfigurerSupport imple
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "amqpretryoptions":
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobComponentConfigurer.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobComponentConfigurer.java
index 99b0032..181d6b1 100644
--- a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobComponentConfigurer.java
+++ b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.storage.blob;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,41 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class BlobComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("blobName", java.lang.String.class);
-        map.put("blobOffset", long.class);
-        map.put("blobType", org.apache.camel.component.azure.storage.blob.BlobType.class);
-        map.put("closeStreamAfterRead", boolean.class);
-        map.put("configuration", org.apache.camel.component.azure.storage.blob.BlobConfiguration.class);
-        map.put("credentials", com.azure.storage.common.StorageSharedKeyCredential.class);
-        map.put("dataCount", java.lang.Long.class);
-        map.put("fileDir", java.lang.String.class);
-        map.put("maxResultsPerPage", java.lang.Integer.class);
-        map.put("maxRetryRequests", int.class);
-        map.put("prefix", java.lang.String.class);
-        map.put("regex", java.lang.String.class);
-        map.put("serviceClient", com.azure.storage.blob.BlobServiceClient.class);
-        map.put("timeout", java.time.Duration.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("blobSequenceNumber", java.lang.Long.class);
-        map.put("blockListType", com.azure.storage.blob.models.BlockListType.class);
-        map.put("closeStreamAfterWrite", boolean.class);
-        map.put("commitBlockListLater", boolean.class);
-        map.put("createAppendBlob", boolean.class);
-        map.put("createPageBlob", boolean.class);
-        map.put("downloadLinkExpiration", java.lang.Long.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.azure.storage.blob.BlobOperationsDefinition.class);
-        map.put("pageBlobSize", java.lang.Long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(BlobComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.azure.storage.blob.BlobConfiguration getOrCreateConfiguration(BlobComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.azure.storage.blob.BlobConfiguration());
@@ -117,15 +83,6 @@ public class BlobComponentConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointConfigurer.java b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointConfigurer.java
index 7a42c0b..7086e57 100644
--- a/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointConfigurer.java
+++ b/components/camel-azure-storage-blob/src/generated/java/org/apache/camel/component/azure/storage/blob/BlobEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.storage.blob;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,46 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class BlobEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("accountName", java.lang.String.class);
-        map.put("containerName", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("blobName", java.lang.String.class);
-        map.put("blobOffset", long.class);
-        map.put("blobServiceClient", com.azure.storage.blob.BlobServiceClient.class);
-        map.put("blobType", org.apache.camel.component.azure.storage.blob.BlobType.class);
-        map.put("closeStreamAfterRead", boolean.class);
-        map.put("credentials", com.azure.storage.common.StorageSharedKeyCredential.class);
-        map.put("dataCount", java.lang.Long.class);
-        map.put("fileDir", java.lang.String.class);
-        map.put("maxResultsPerPage", java.lang.Integer.class);
-        map.put("maxRetryRequests", int.class);
-        map.put("prefix", java.lang.String.class);
-        map.put("regex", java.lang.String.class);
-        map.put("serviceClient", com.azure.storage.blob.BlobServiceClient.class);
-        map.put("timeout", java.time.Duration.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("blobSequenceNumber", java.lang.Long.class);
-        map.put("blockListType", com.azure.storage.blob.models.BlockListType.class);
-        map.put("closeStreamAfterWrite", boolean.class);
-        map.put("commitBlockListLater", boolean.class);
-        map.put("createAppendBlob", boolean.class);
-        map.put("createPageBlob", boolean.class);
-        map.put("downloadLinkExpiration", java.lang.Long.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.azure.storage.blob.BlobOperationsDefinition.class);
-        map.put("pageBlobSize", java.lang.Long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("accessKey", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(BlobEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         BlobEndpoint target = (BlobEndpoint) obj;
@@ -121,15 +82,6 @@ public class BlobEndpointConfigurer extends PropertyConfigurerSupport implements
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueComponentConfigurer.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueComponentConfigurer.java
index b97a0ef..ff26b96 100644
--- a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueComponentConfigurer.java
+++ b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.storage.queue;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class QueueComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("configuration", org.apache.camel.component.azure.storage.queue.QueueConfiguration.class);
-        map.put("serviceClient", com.azure.storage.queue.QueueServiceClient.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("createQueue", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.azure.storage.queue.QueueOperationDefinition.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("maxMessages", java.lang.Integer.class);
-        map.put("messageId", java.lang.String.class);
-        map.put("popReceipt", java.lang.String.class);
-        map.put("timeout", java.time.Duration.class);
-        map.put("timeToLive", java.time.Duration.class);
-        map.put("visibilityTimeout", java.time.Duration.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("credentials", com.azure.storage.common.StorageSharedKeyCredential.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(QueueComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.azure.storage.queue.QueueConfiguration getOrCreateConfiguration(QueueComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.azure.storage.queue.QueueConfiguration());
@@ -83,15 +61,6 @@ public class QueueComponentConfigurer extends PropertyConfigurerSupport implemen
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointConfigurer.java b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointConfigurer.java
index f5ebf9d..5cb9452 100644
--- a/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointConfigurer.java
+++ b/components/camel-azure-storage-queue/src/generated/java/org/apache/camel/component/azure/storage/queue/QueueEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.storage.queue;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,33 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class QueueEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("accountName", java.lang.String.class);
-        map.put("queueName", java.lang.String.class);
-        map.put("autoDiscoverClient", boolean.class);
-        map.put("serviceClient", com.azure.storage.queue.QueueServiceClient.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("createQueue", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.azure.storage.queue.QueueOperationDefinition.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("maxMessages", java.lang.Integer.class);
-        map.put("messageId", java.lang.String.class);
-        map.put("popReceipt", java.lang.String.class);
-        map.put("timeout", java.time.Duration.class);
-        map.put("timeToLive", java.time.Duration.class);
-        map.put("visibilityTimeout", java.time.Duration.class);
-        map.put("accessKey", java.lang.String.class);
-        map.put("credentials", com.azure.storage.common.StorageSharedKeyCredential.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(QueueEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         QueueEndpoint target = (QueueEndpoint) obj;
@@ -84,15 +58,6 @@ public class QueueEndpointConfigurer extends PropertyConfigurerSupport implement
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "accesskey":
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurer.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurer.java
index 9dc50be..88ef9a9 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurer.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.blob;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,35 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class BlobServiceComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("azureBlobClient", com.microsoft.azure.storage.blob.CloudBlob.class);
-        map.put("blobOffset", java.lang.Long.class);
-        map.put("blobType", org.apache.camel.component.azure.blob.BlobType.class);
-        map.put("closeStreamAfterRead", boolean.class);
-        map.put("credentials", com.microsoft.azure.storage.StorageCredentials.class);
-        map.put("dataLength", java.lang.Long.class);
-        map.put("fileDir", java.lang.String.class);
-        map.put("publicForRead", boolean.class);
-        map.put("streamReadSize", int.class);
-        map.put("validateClientURI", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("blobMetadata", java.util.Map.class);
-        map.put("blobPrefix", java.lang.String.class);
-        map.put("closeStreamAfterWrite", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.azure.blob.BlobServiceOperations.class);
-        map.put("streamWriteSize", int.class);
-        map.put("useFlatListing", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("configuration", org.apache.camel.component.azure.blob.BlobServiceConfiguration.class);
-        map.put("credentialsAccountKey", java.lang.String.class);
-        map.put("credentialsAccountName", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(BlobServiceComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.azure.blob.BlobServiceConfiguration getOrCreateConfiguration(BlobServiceComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.azure.blob.BlobServiceConfiguration());
@@ -102,15 +74,6 @@ public class BlobServiceComponentConfigurer extends PropertyConfigurerSupport im
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "azureblobclient":
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointConfigurer.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointConfigurer.java
index a322819..e184cb3 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointConfigurer.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/blob/BlobServiceEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.blob;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,38 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class BlobServiceEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("containerOrBlobUri", java.lang.String.class);
-        map.put("azureBlobClient", com.microsoft.azure.storage.blob.CloudBlob.class);
-        map.put("blobOffset", java.lang.Long.class);
-        map.put("blobType", org.apache.camel.component.azure.blob.BlobType.class);
-        map.put("closeStreamAfterRead", boolean.class);
-        map.put("credentials", com.microsoft.azure.storage.StorageCredentials.class);
-        map.put("dataLength", java.lang.Long.class);
-        map.put("fileDir", java.lang.String.class);
-        map.put("publicForRead", boolean.class);
-        map.put("streamReadSize", int.class);
-        map.put("validateClientURI", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("blobMetadata", java.util.Map.class);
-        map.put("blobPrefix", java.lang.String.class);
-        map.put("closeStreamAfterWrite", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("operation", org.apache.camel.component.azure.blob.BlobServiceOperations.class);
-        map.put("streamWriteSize", int.class);
-        map.put("useFlatListing", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("credentialsAccountKey", java.lang.String.class);
-        map.put("credentialsAccountName", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(BlobServiceEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         BlobServiceEndpoint target = (BlobServiceEndpoint) obj;
@@ -102,15 +71,6 @@ public class BlobServiceEndpointConfigurer extends PropertyConfigurerSupport imp
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "azureblobclient":
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurer.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurer.java
index 47e07af..f1d0465 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurer.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.queue;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,26 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class QueueServiceComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("azureQueueClient", com.microsoft.azure.storage.queue.CloudQueue.class);
-        map.put("credentials", com.microsoft.azure.storage.StorageCredentials.class);
-        map.put("validateClientURI", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageTimeToLive", int.class);
-        map.put("messageVisibilityDelay", int.class);
-        map.put("operation", org.apache.camel.component.azure.queue.QueueServiceOperations.class);
-        map.put("queuePrefix", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("configuration", org.apache.camel.component.azure.queue.QueueServiceConfiguration.class);
-        map.put("credentialsAccountKey", java.lang.String.class);
-        map.put("credentialsAccountName", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(QueueServiceComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     private org.apache.camel.component.azure.queue.QueueServiceConfiguration getOrCreateConfiguration(QueueServiceComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.azure.queue.QueueServiceConfiguration());
@@ -75,15 +56,6 @@ public class QueueServiceComponentConfigurer extends PropertyConfigurerSupport i
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "azurequeueclient":
diff --git a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointConfigurer.java b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointConfigurer.java
index 3ef5e42..1f9bc0e 100644
--- a/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointConfigurer.java
+++ b/components/camel-azure/src/generated/java/org/apache/camel/component/azure/queue/QueueServiceEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.azure.queue;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,29 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class QueueServiceEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("containerAndQueueUri", java.lang.String.class);
-        map.put("azureQueueClient", com.microsoft.azure.storage.queue.CloudQueue.class);
-        map.put("credentials", com.microsoft.azure.storage.StorageCredentials.class);
-        map.put("validateClientURI", boolean.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("messageTimeToLive", int.class);
-        map.put("messageVisibilityDelay", int.class);
-        map.put("operation", org.apache.camel.component.azure.queue.QueueServiceOperations.class);
-        map.put("queuePrefix", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        map.put("credentialsAccountKey", java.lang.String.class);
-        map.put("credentialsAccountName", java.lang.String.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(QueueServiceEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         QueueServiceEndpoint target = (QueueServiceEndpoint) obj;
@@ -75,15 +53,6 @@ public class QueueServiceEndpointConfigurer extends PropertyConfigurerSupport im
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "azurequeueclient":
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
index 3ab4ddb..b89ea44 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorComponentConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.bean.validator;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,21 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("ignoreXmlConfiguration", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("constraintValidatorFactory", javax.validation.ConstraintValidatorFactory.class);
-        map.put("messageInterpolator", javax.validation.MessageInterpolator.class);
-        map.put("traversableResolver", javax.validation.TraversableResolver.class);
-        map.put("validationProviderResolver", javax.validation.ValidationProviderResolver.class);
-        map.put("validatorFactory", javax.validation.ValidatorFactory.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(BeanValidatorComponentConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         BeanValidatorComponent target = (BeanValidatorComponent) obj;
@@ -56,15 +42,6 @@ public class BeanValidatorComponentConfigurer extends PropertyConfigurerSupport
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    public static void clearBootstrapConfigurers() {
-        ALL_OPTIONS.clear();
-    }
-
-    @Override
     public Class<?> getOptionType(String name, boolean ignoreCase) {
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "basicpropertybinding":
diff --git a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
index 20739e3..82ac6a4 100644
--- a/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
+++ b/components/camel-bean-validator/src/generated/java/org/apache/camel/component/bean/validator/BeanValidatorEndpointConfigurer.java
@@ -4,9 +4,10 @@ package org.apache.camel.component.bean.validator;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
+import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.spi.ConfigurerStrategy;
 import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -16,24 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class BeanValidatorEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("label", java.lang.String.class);
-        map.put("group", java.lang.String.class);
-        map.put("ignoreXmlConfiguration", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("constraintValidatorFactory", javax.validation.ConstraintValidatorFactory.class);
-        map.put("messageInterpolator", javax.validation.MessageInterpolator.class);
-        map.put("synchronous", boolean.class);
-        map.put("traversableResolver", javax.validation.TraversableResolver.class);
-        map.put("validationProviderResolver", javax.validation.ValidationProviderResolver.class);
-        map.put("validatorFactory", javax.validation.ValidatorFactory.class);
-        ALL_OPTIONS = map;
-        ConfigurerStrategy.addBootstrapConfigurerClearer(BeanValidatorEndpointConfigurer::clearBootstrapConfigurers);
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         BeanValidatorEndpoint target = (BeanValidatorEndpoint) obj;
... 44255 lines suppressed ...