[camel] branch 13557 updated (16cc010 -> 82a5987)

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

[camel] branch 13557 updated (16cc010 -> 82a5987)

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

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


    from 16cc010  CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.
     new fda0ba7  CAMEL-13566: IntrospectionSupport - Remove old legacy JDK PropertyEditor
     new d0b64ac  CAMEL-13569: JndiContext - Remove old bean binding
     new 7de0d6c  CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.
     new ff36d15  CAMEL-13557: Regen
     new 3c079fb  CAMEL-13557: Regen
     new 82a5987  CAMEL-13557: Camel main can configure properties on camel context also

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


Summary of changes:
 .../src/main/docs/activemq-component.adoc          |  9 ++--
 .../src/main/docs/ahc-ws-component.adoc            |  9 ++--
 .../camel-ahc/src/main/docs/ahc-component.adoc     |  9 ++--
 .../camel-amqp/src/main/docs/amqp-component.adoc   |  9 ++--
 .../camel-apns/src/main/docs/apns-component.adoc   |  9 ++--
 .../src/main/docs/as2-component.adoc               |  9 ++--
 .../src/main/docs/asterisk-component.adoc          | 17 +++++--
 .../camel-atmos/src/main/docs/atmos-component.adoc |  9 ++--
 .../main/docs/atmosphere-websocket-component.adoc  |  9 ++--
 .../camel-atom/src/main/docs/atom-component.adoc   | 17 +++++--
 .../src/main/docs/atomix-map-component.adoc        |  9 ++--
 .../src/main/docs/atomix-messaging-component.adoc  |  9 ++--
 .../src/main/docs/atomix-multimap-component.adoc   |  9 ++--
 .../src/main/docs/atomix-queue-component.adoc      |  9 ++--
 .../src/main/docs/atomix-set-component.adoc        |  9 ++--
 .../src/main/docs/atomix-value-component.adoc      |  9 ++--
 .../camel-avro/src/main/docs/avro-component.adoc   |  9 ++--
 .../camel-avro/src/main/docs/avro-dataformat.adoc  |  3 +-
 .../src/main/docs/aws-cw-component.adoc            |  9 ++--
 .../src/main/docs/aws-ddb-component.adoc           |  9 ++--
 .../src/main/docs/aws-ddbstream-component.adoc     |  9 ++--
 .../src/main/docs/aws-ec2-component.adoc           |  9 ++--
 .../src/main/docs/aws-ecs-component.adoc           |  9 ++--
 .../src/main/docs/aws-eks-component.adoc           |  9 ++--
 .../src/main/docs/aws-iam-component.adoc           |  9 ++--
 .../src/main/docs/aws-kinesis-component.adoc       |  9 ++--
 .../main/docs/aws-kinesis-firehose-component.adoc  |  9 ++--
 .../src/main/docs/aws-kms-component.adoc           |  9 ++--
 .../src/main/docs/aws-lambda-component.adoc        |  9 ++--
 .../src/main/docs/aws-mq-component.adoc            |  9 ++--
 .../src/main/docs/aws-msk-component.adoc           |  9 ++--
 .../src/main/docs/aws-s3-component.adoc            |  9 ++--
 .../src/main/docs/aws-sdb-component.adoc           | 17 +++++--
 .../src/main/docs/aws-ses-component.adoc           |  9 ++--
 .../src/main/docs/aws-sns-component.adoc           |  9 ++--
 .../src/main/docs/aws-sqs-component.adoc           |  9 ++--
 .../src/main/docs/aws-swf-component.adoc           |  9 ++--
 .../src/main/docs/azure-blob-component.adoc        |  9 ++--
 .../src/main/docs/azure-queue-component.adoc       |  9 ++--
 .../src/main/docs/bean-validator-component.adoc    | 17 +++++--
 .../camel-bean/src/main/docs/bean-component.adoc   |  6 ++-
 .../camel-bean/src/main/docs/class-component.adoc  |  6 ++-
 .../src/main/docs/beanstalk-component.adoc         |  9 ++--
 .../src/main/docs/bonita-component.adoc            | 17 +++++--
 .../src/main/docs/box-component.adoc               |  9 ++--
 .../src/main/docs/braintree-component.adoc         |  9 ++--
 .../src/main/docs/browse-component.adoc            | 17 +++++--
 .../src/main/docs/caffeine-cache-component.adoc    |  9 ++--
 .../main/docs/caffeine-loadcache-component.adoc    |  9 ++--
 .../src/main/docs/cql-component.adoc               | 17 +++++--
 .../src/main/docs/chatscript-component.adoc        | 17 +++++--
 .../camel-chunk/src/main/docs/chunk-component.adoc | 17 +++++--
 .../src/main/docs/cm-sms-component.adoc            | 17 +++++--
 .../camel-cmis/src/main/docs/cmis-component.adoc   |  9 ++--
 .../camel-coap/src/main/docs/coap-component.adoc   | 17 +++++--
 .../src/main/docs/cometd-component.adoc            |  9 ++--
 .../src/main/docs/consul-component.adoc            |  9 ++--
 .../src/main/docs/controlbus-component.adoc        | 17 +++++--
 .../camel-corda/src/main/docs/corda-component.adoc |  9 ++--
 .../src/main/docs/couchbase-component.adoc         | 17 +++++--
 .../src/main/docs/couchdb-component.adoc           | 17 +++++--
 .../src/main/docs/crypto-cms-component.adoc        |  9 ++--
 .../src/main/docs/crypto-component.adoc            |  9 ++--
 .../src/main/docs/crypto-dataformat.adoc           |  3 +-
 .../camel-cxf/src/main/docs/cxf-component.adoc     |  9 ++--
 .../camel-cxf/src/main/docs/cxfrs-component.adoc   |  9 ++--
 .../src/main/docs/dataformat-component.adoc        | 17 +++++--
 .../src/main/docs/dataset-component.adoc           | 17 +++++--
 .../src/main/docs/dataset-test-component.adoc      | 19 ++++++--
 .../src/main/docs/digitalocean-component.adoc      | 17 +++++--
 .../src/main/docs/direct-component.adoc            |  9 ++--
 .../src/main/docs/direct-vm-component.adoc         |  6 ++-
 .../src/main/docs/disruptor-component.adoc         | 10 ++--
 .../camel-dns/src/main/docs/dns-component.adoc     | 17 +++++--
 .../src/main/docs/docker-component.adoc            |  9 ++--
 .../camel-dozer/src/main/docs/dozer-component.adoc | 17 +++++--
 .../camel-drill/src/main/docs/drill-component.adoc | 17 +++++--
 .../src/main/docs/dropbox-component.adoc           | 17 +++++--
 .../src/main/docs/ehcache-component.adoc           |  9 ++--
 .../camel-ejb/src/main/docs/ejb-component.adoc     |  6 ++-
 .../main/docs/elasticsearch-rest-component.adoc    |  9 ++--
 .../camel-elsql/src/main/docs/elsql-component.adoc |  9 ++--
 .../camel-etcd/src/main/docs/etcd-component.adoc   |  9 ++--
 .../src/main/docs/eventadmin-component.adoc        |  6 ++-
 .../camel-exec/src/main/docs/exec-component.adoc   | 17 +++++--
 .../src/main/docs/facebook-component.adoc          |  9 ++--
 .../src/main/docs/fhir-component.adoc              |  9 ++--
 .../camel-file/src/main/docs/file-component.adoc   | 17 +++++--
 .../src/main/docs/flatpack-component.adoc          | 17 +++++--
 .../src/main/docs/flatpack-dataformat.adoc         |  3 +-
 .../camel-flink/src/main/docs/flink-component.adoc |  9 ++--
 .../camel-fop/src/main/docs/fop-component.adoc     | 17 +++++--
 .../src/main/docs/freemarker-component.adoc        |  9 ++--
 .../camel-ftp/src/main/docs/ftp-component.adoc     | 17 +++++--
 .../camel-ftp/src/main/docs/ftps-component.adoc    |  9 ++--
 .../camel-ftp/src/main/docs/sftp-component.adoc    | 14 +++++-
 .../src/main/docs/ganglia-component.adoc           |  9 ++--
 .../src/main/docs/geocoder-component.adoc          | 17 +++++--
 .../camel-git/src/main/docs/git-component.adoc     | 17 +++++--
 .../src/main/docs/github-component.adoc            | 17 +++++--
 .../src/main/docs/google-bigquery-component.adoc   |  9 ++--
 .../main/docs/google-bigquery-sql-component.adoc   |  9 ++--
 .../src/main/docs/google-calendar-component.adoc   |  9 ++--
 .../docs/google-calendar-stream-component.adoc     |  9 ++--
 .../src/main/docs/google-drive-component.adoc      |  9 ++--
 .../src/main/docs/google-mail-component.adoc       |  9 ++--
 .../main/docs/google-mail-stream-component.adoc    |  9 ++--
 .../src/main/docs/google-pubsub-component.adoc     |  9 ++--
 .../src/main/docs/google-sheets-component.adoc     |  9 ++--
 .../main/docs/google-sheets-stream-component.adoc  |  9 ++--
 .../camel-gora/src/main/docs/gora-component.adoc   | 17 +++++--
 .../camel-grape/src/main/docs/grape-component.adoc |  6 ++-
 .../camel-grpc/src/main/docs/grpc-component.adoc   | 17 +++++--
 .../src/main/docs/guava-eventbus-component.adoc    |  9 ++--
 .../main/docs/hazelcast-atomicvalue-component.adoc |  9 ++--
 .../main/docs/hazelcast-instance-component.adoc    |  9 ++--
 .../src/main/docs/hazelcast-list-component.adoc    |  9 ++--
 .../src/main/docs/hazelcast-map-component.adoc     |  9 ++--
 .../main/docs/hazelcast-multimap-component.adoc    |  9 ++--
 .../src/main/docs/hazelcast-queue-component.adoc   |  9 ++--
 .../docs/hazelcast-replicatedmap-component.adoc    |  9 ++--
 .../main/docs/hazelcast-ringbuffer-component.adoc  |  9 ++--
 .../src/main/docs/hazelcast-seda-component.adoc    |  9 ++--
 .../src/main/docs/hazelcast-set-component.adoc     |  9 ++--
 .../src/main/docs/hazelcast-topic-component.adoc   |  9 ++--
 .../camel-hbase/src/main/docs/hbase-component.adoc |  9 ++--
 .../camel-hdfs2/src/main/docs/hdfs2-component.adoc |  9 ++--
 .../src/main/docs/hipchat-component.adoc           | 17 +++++--
 .../camel-http4/src/main/docs/http4-component.adoc |  9 ++--
 .../src/main/docs/iec60870-client-component.adoc   |  9 ++--
 .../src/main/docs/iec60870-server-component.adoc   |  9 ++--
 .../src/main/docs/ignite-cache-component.adoc      |  9 ++--
 .../src/main/docs/ignite-compute-component.adoc    |  9 ++--
 .../src/main/docs/ignite-events-component.adoc     |  9 ++--
 .../src/main/docs/ignite-idgen-component.adoc      |  9 ++--
 .../src/main/docs/ignite-messaging-component.adoc  |  9 ++--
 .../src/main/docs/ignite-queue-component.adoc      |  9 ++--
 .../src/main/docs/ignite-set-component.adoc        |  9 ++--
 .../src/main/docs/infinispan-component.adoc        |  9 ++--
 .../src/main/docs/influxdb-component.adoc          | 17 +++++--
 .../camel-iota/src/main/docs/iota-component.adoc   | 17 +++++--
 .../camel-ipfs/src/main/docs/ipfs-component.adoc   | 17 +++++--
 .../camel-irc/src/main/docs/irc-component.adoc     |  9 ++--
 .../src/main/docs/ironmq-component.adoc            | 17 +++++--
 .../camel-jbpm/src/main/docs/jbpm-component.adoc   | 17 +++++--
 .../src/main/docs/jcache-component.adoc            |  9 ++--
 .../src/main/docs/jclouds-component.adoc           |  9 ++--
 .../camel-jcr/src/main/docs/jcr-component.adoc     | 17 +++++--
 .../camel-jdbc/src/main/docs/jdbc-component.adoc   |  9 ++--
 .../camel-jetty/src/main/docs/jetty-component.adoc |  9 ++--
 .../src/main/docs/jgroups-raft-component.adoc      |  9 ++--
 .../src/main/docs/jgroups-component.adoc           |  9 ++--
 .../camel-jing/src/main/docs/jing-component.adoc   | 17 +++++--
 .../camel-jira/src/main/docs/jira-component.adoc   |  9 ++--
 .../camel-jms/src/main/docs/jms-component.adoc     |  9 ++--
 .../camel-jmx/src/main/docs/jmx-component.adoc     | 17 +++++--
 .../camel-jolt/src/main/docs/jolt-component.adoc   |  9 ++--
 .../camel-jooq/src/main/docs/jooq-component.adoc   |  9 ++--
 .../camel-jpa/src/main/docs/jpa-component.adoc     |  9 ++--
 .../camel-jsch/src/main/docs/scp-component.adoc    |  9 ++--
 .../src/main/docs/json-validator-component.adoc    | 17 +++++--
 .../camel-jt400/src/main/docs/jt400-component.adoc |  9 ++--
 .../camel-kafka/src/main/docs/kafka-component.adoc |  9 ++--
 .../docs/kubernetes-config-maps-component.adoc     | 17 +++++--
 .../docs/kubernetes-deployments-component.adoc     | 17 +++++--
 .../src/main/docs/kubernetes-hpa-component.adoc    | 17 +++++--
 .../src/main/docs/kubernetes-job-component.adoc    | 17 +++++--
 .../main/docs/kubernetes-namespaces-component.adoc | 17 +++++--
 .../src/main/docs/kubernetes-nodes-component.adoc  | 17 +++++--
 ...rnetes-persistent-volumes-claims-component.adoc | 17 +++++--
 .../kubernetes-persistent-volumes-component.adoc   | 17 +++++--
 .../src/main/docs/kubernetes-pods-component.adoc   | 17 +++++--
 ...bernetes-replication-controllers-component.adoc | 17 +++++--
 .../docs/kubernetes-resources-quota-component.adoc | 17 +++++--
 .../main/docs/kubernetes-secrets-component.adoc    | 17 +++++--
 .../kubernetes-service-accounts-component.adoc     | 17 +++++--
 .../main/docs/kubernetes-services-component.adoc   | 17 +++++--
 .../docs/openshift-build-configs-component.adoc    | 14 +++++-
 .../src/main/docs/openshift-builds-component.adoc  | 14 +++++-
 .../src/main/docs/language-component.adoc          | 17 +++++--
 .../camel-ldap/src/main/docs/ldap-component.adoc   | 17 +++++--
 .../camel-ldif/src/main/docs/ldif-component.adoc   | 17 +++++--
 .../src/main/docs/linkedin-component.adoc          |  9 ++--
 .../camel-log/src/main/docs/log-component.adoc     |  9 ++--
 .../src/main/docs/lucene-component.adoc            |  9 ++--
 .../src/main/docs/lumberjack-component.adoc        |  9 ++--
 .../camel-mail/src/main/docs/mail-component.adoc   |  9 ++--
 .../src/main/docs/master-component.adoc            |  9 ++--
 .../src/main/docs/metrics-component.adoc           |  9 ++--
 .../src/main/docs/micrometer-component.adoc        |  9 ++--
 .../src/main/docs/milo-client-component.adoc       |  9 ++--
 .../src/main/docs/milo-server-component.adoc       |  9 ++--
 .../camel-mina2/src/main/docs/mina2-component.adoc |  9 ++--
 .../camel-mllp/src/main/docs/mllp-component.adoc   |  9 ++--
 .../camel-mock/src/main/docs/mock-component.adoc   | 14 +++++-
 .../src/main/docs/mongodb-gridfs-component.adoc    | 17 +++++--
 .../src/main/docs/mongodb3-component.adoc          | 17 +++++--
 .../camel-mqtt/src/main/docs/mqtt-component.adoc   |  9 ++--
 .../camel-msv/src/main/docs/msv-component.adoc     |  9 ++--
 .../src/main/docs/mustache-component.adoc          |  9 ++--
 .../camel-mvel/src/main/docs/mvel-component.adoc   | 17 +++++--
 .../camel-mvel/src/main/docs/mvel-language.adoc    |  3 +-
 .../src/main/docs/mybatis-bean-component.adoc      |  9 ++--
 .../src/main/docs/mybatis-component.adoc           |  9 ++--
 .../src/main/docs/nagios-component.adoc            |  9 ++--
 .../camel-nats/src/main/docs/nats-component.adoc   |  9 ++--
 .../src/main/docs/netty4-http-component.adoc       |  9 ++--
 .../src/main/docs/netty4-component.adoc            |  9 ++--
 .../camel-nsq/src/main/docs/nsq-component.adoc     |  9 ++--
 .../src/main/docs/olingo2-component.adoc           |  9 ++--
 .../src/main/docs/olingo4-component.adoc           |  9 ++--
 .../src/main/docs/openstack-cinder-component.adoc  | 17 +++++--
 .../src/main/docs/openstack-glance-component.adoc  | 17 +++++--
 .../main/docs/openstack-keystone-component.adoc    | 17 +++++--
 .../src/main/docs/openstack-neutron-component.adoc | 17 +++++--
 .../src/main/docs/openstack-nova-component.adoc    | 17 +++++--
 .../src/main/docs/openstack-swift-component.adoc   | 17 +++++--
 .../src/main/docs/optaplanner-component.adoc       | 17 +++++--
 .../camel-paho/src/main/docs/paho-component.adoc   |  9 ++--
 .../src/main/docs/paxlogging-component.adoc        |  6 ++-
 .../camel-pdf/src/main/docs/pdf-component.adoc     | 17 +++++--
 .../src/main/docs/pgevent-component.adoc           | 17 +++++--
 .../camel-printer/src/main/docs/lpr-component.adoc | 17 +++++--
 .../src/main/docs/properties-component.adoc        |  9 ++--
 .../src/main/docs/pubnub-component.adoc            | 17 +++++--
 .../src/main/docs/pulsar-component.adoc            | 11 +++--
 .../src/main/docs/quartz2-component.adoc           |  9 ++--
 .../src/main/docs/quickfix-component.adoc          |  9 ++--
 .../src/main/docs/rabbitmq-component.adoc          |  9 ++--
 .../src/main/docs/reactive-streams-component.adoc  |  9 ++--
 .../camel-ref/src/main/docs/ref-component.adoc     | 17 +++++--
 .../src/main/docs/rest-swagger-component.adoc      |  9 ++--
 .../src/main/docs/rest-api-component.adoc          | 17 +++++--
 .../camel-rest/src/main/docs/rest-component.adoc   |  9 ++--
 .../src/main/docs/restlet-component.adoc           |  9 ++--
 .../camel-rss/src/main/docs/rss-component.adoc     | 17 +++++--
 .../camel-rss/src/main/docs/rss-dataformat.adoc    |  3 +-
 .../camel-saga/src/main/docs/saga-component.adoc   | 17 +++++--
 .../src/main/docs/salesforce-component.adoc        |  9 ++--
 .../src/main/docs/sap-netweaver-component.adoc     | 17 +++++--
 .../src/main/docs/xquery-component.adoc            |  9 ++--
 .../camel-saxon/src/main/docs/xquery-language.adoc |  3 +-
 .../src/main/docs/scheduler-component.adoc         |  9 ++--
 .../src/main/docs/schematron-component.adoc        | 17 +++++--
 .../camel-seda/src/main/docs/seda-component.adoc   |  9 ++--
 .../src/main/docs/service-component.adoc           |  9 ++--
 .../src/main/docs/servicenow-component.adoc        |  9 ++--
 .../src/main/docs/servlet-component.adoc           |  9 ++--
 .../camel-sip/src/main/docs/sip-component.adoc     | 17 +++++--
 .../src/main/docs/sjms-batch-component.adoc        |  9 ++--
 .../camel-sjms/src/main/docs/sjms-component.adoc   |  9 ++--
 .../camel-sjms2/src/main/docs/sjms2-component.adoc |  9 ++--
 .../camel-slack/src/main/docs/slack-component.adoc |  9 ++--
 .../camel-smpp/src/main/docs/smpp-component.adoc   |  9 ++--
 .../camel-snmp/src/main/docs/snmp-component.adoc   | 17 +++++--
 .../camel-solr/src/main/docs/solr-component.adoc   | 17 +++++--
 .../src/main/docs/soroush-component.adoc           |  9 ++--
 .../src/main/docs/spark-rest-component.adoc        |  6 ++-
 .../camel-spark/src/main/docs/spark-component.adoc |  9 ++--
 .../src/main/docs/splunk-component.adoc            |  9 ++--
 .../src/main/docs/spring-batch-component.adoc      |  9 ++--
 .../main/docs/spring-integration-component.adoc    | 17 +++++--
 .../src/main/docs/spring-ldap-component.adoc       | 17 +++++--
 .../src/main/docs/spring-redis-component.adoc      | 17 +++++--
 .../src/main/docs/spring-ws-component.adoc         |  9 ++--
 .../src/main/docs/spring-event-component.adoc      | 17 +++++--
 .../camel-sql/src/main/docs/sql-component.adoc     |  9 ++--
 .../src/main/docs/sql-stored-component.adoc        |  9 ++--
 .../camel-ssh/src/main/docs/ssh-component.adoc     |  9 ++--
 .../camel-stax/src/main/docs/stax-component.adoc   | 17 +++++--
 .../camel-stomp/src/main/docs/stomp-component.adoc |  9 ++--
 .../src/main/docs/stream-component.adoc            | 17 +++++--
 .../src/main/docs/string-template-component.adoc   | 17 +++++--
 .../camel-stub/src/main/docs/stub-component.adoc   |  9 ++--
 .../src/main/docs/telegram-component.adoc          |  9 ++--
 .../src/main/docs/thrift-component.adoc            |  9 ++--
 .../src/main/docs/thrift-dataformat.adoc           |  3 +-
 .../camel-tika/src/main/docs/tika-component.adoc   | 17 +++++--
 .../camel-timer/src/main/docs/timer-component.adoc | 17 +++++--
 .../src/main/docs/twilio-component.adoc            |  9 ++--
 .../main/docs/twitter-directmessage-component.adoc |  9 ++--
 .../src/main/docs/twitter-search-component.adoc    |  9 ++--
 .../src/main/docs/twitter-streaming-component.adoc |  9 ++--
 .../src/main/docs/twitter-timeline-component.adoc  |  9 ++--
 .../src/main/docs/undertow-component.adoc          |  9 ++--
 .../src/main/docs/validator-component.adoc         |  9 ++--
 .../src/main/docs/velocity-component.adoc          |  9 ++--
 .../camel-vertx/src/main/docs/vertx-component.adoc |  9 ++--
 .../camel-vm/src/main/docs/vm-component.adoc       |  9 ++--
 .../src/main/docs/weather-component.adoc           |  9 ++--
 .../camel-web3j/src/main/docs/web3j-component.adoc |  9 ++--
 .../src/main/docs/webhook-component.adoc           |  9 ++--
 .../src/main/docs/websocket-jsr356-component.adoc  | 17 +++++--
 .../src/main/docs/websocket-component.adoc         |  9 ++--
 .../src/main/docs/wordpress-component.adoc         |  9 ++--
 .../src/main/docs/xchange-component.adoc           | 17 +++++--
 .../src/main/docs/xmlsecurity-component.adoc       |  9 ++--
 .../camel-xmpp/src/main/docs/xmpp-component.adoc   | 17 +++++--
 .../camel-xslt/src/main/docs/xslt-component.adoc   |  9 ++--
 .../src/main/docs/yammer-component.adoc            |  9 ++--
 .../src/main/docs/zendesk-component.adoc           |  9 ++--
 .../src/main/docs/zookeeper-master-component.adoc  |  9 ++--
 .../src/main/docs/zookeeper-component.adoc         |  9 ++--
 .../java/org/apache/camel/main/MainSupport.java    | 16 +++++++
 .../java/org/apache/camel/impl/RegistryTest.java   | 56 ----------------------
 .../camel/support/IntrospectionSupportTest.java    |  6 +--
 .../org/apache/camel/support/jndi/JndiTest.java    | 11 +----
 .../src/test/resources/jndi-example.properties     |  4 --
 .../org/apache/camel/support/DefaultEndpoint.java  |  2 +-
 .../apache/camel/support/IntrospectionSupport.java | 37 ++------------
 .../camel/support/PropertyBindingSupport.java      |  1 -
 .../org/apache/camel/support/jndi/JndiContext.java | 23 +--------
 .../modules/ROOT/pages/activemq-component.adoc     |  9 ++--
 .../modules/ROOT/pages/ahc-component.adoc          |  9 ++--
 .../modules/ROOT/pages/ahc-ws-component.adoc       |  9 ++--
 .../modules/ROOT/pages/amqp-component.adoc         |  9 ++--
 .../modules/ROOT/pages/apns-component.adoc         |  9 ++--
 .../modules/ROOT/pages/asterisk-component.adoc     | 17 +++++--
 .../modules/ROOT/pages/atmos-component.adoc        |  9 ++--
 .../ROOT/pages/atmosphere-websocket-component.adoc |  9 ++--
 .../modules/ROOT/pages/atom-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/atomix-map-component.adoc   |  9 ++--
 .../ROOT/pages/atomix-messaging-component.adoc     |  9 ++--
 .../ROOT/pages/atomix-multimap-component.adoc      |  9 ++--
 .../modules/ROOT/pages/atomix-queue-component.adoc |  9 ++--
 .../modules/ROOT/pages/atomix-set-component.adoc   |  9 ++--
 .../modules/ROOT/pages/atomix-value-component.adoc |  9 ++--
 .../modules/ROOT/pages/avro-component.adoc         |  9 ++--
 .../modules/ROOT/pages/avro-dataformat.adoc        |  3 +-
 .../modules/ROOT/pages/aws-cw-component.adoc       |  9 ++--
 .../modules/ROOT/pages/aws-ddb-component.adoc      |  9 ++--
 .../ROOT/pages/aws-ddbstream-component.adoc        |  9 ++--
 .../modules/ROOT/pages/aws-ec2-component.adoc      |  9 ++--
 .../modules/ROOT/pages/aws-ecs-component.adoc      |  9 ++--
 .../modules/ROOT/pages/aws-eks-component.adoc      |  9 ++--
 .../modules/ROOT/pages/aws-iam-component.adoc      |  9 ++--
 .../modules/ROOT/pages/aws-kinesis-component.adoc  |  9 ++--
 .../ROOT/pages/aws-kinesis-firehose-component.adoc |  9 ++--
 .../modules/ROOT/pages/aws-kms-component.adoc      |  9 ++--
 .../modules/ROOT/pages/aws-lambda-component.adoc   |  9 ++--
 .../modules/ROOT/pages/aws-mq-component.adoc       |  9 ++--
 .../modules/ROOT/pages/aws-msk-component.adoc      |  9 ++--
 .../modules/ROOT/pages/aws-s3-component.adoc       |  9 ++--
 .../modules/ROOT/pages/aws-sdb-component.adoc      | 17 +++++--
 .../modules/ROOT/pages/aws-ses-component.adoc      |  9 ++--
 .../modules/ROOT/pages/aws-sns-component.adoc      |  9 ++--
 .../modules/ROOT/pages/aws-sqs-component.adoc      |  9 ++--
 .../modules/ROOT/pages/aws-swf-component.adoc      |  9 ++--
 .../modules/ROOT/pages/azure-blob-component.adoc   |  9 ++--
 .../modules/ROOT/pages/azure-queue-component.adoc  |  9 ++--
 .../modules/ROOT/pages/bean-component.adoc         |  6 ++-
 .../ROOT/pages/bean-validator-component.adoc       | 17 +++++--
 .../modules/ROOT/pages/beanstalk-component.adoc    |  9 ++--
 .../modules/ROOT/pages/bonita-component.adoc       | 17 +++++--
 .../modules/ROOT/pages/braintree-component.adoc    |  9 ++--
 .../modules/ROOT/pages/browse-component.adoc       | 17 +++++--
 .../ROOT/pages/caffeine-cache-component.adoc       |  9 ++--
 .../ROOT/pages/caffeine-loadcache-component.adoc   |  9 ++--
 .../modules/ROOT/pages/chatscript-component.adoc   | 17 +++++--
 .../modules/ROOT/pages/chunk-component.adoc        | 17 +++++--
 .../modules/ROOT/pages/class-component.adoc        |  6 ++-
 .../modules/ROOT/pages/cm-sms-component.adoc       | 17 +++++--
 .../modules/ROOT/pages/cmis-component.adoc         |  9 ++--
 .../modules/ROOT/pages/coap-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/cometd-component.adoc       |  9 ++--
 .../modules/ROOT/pages/consul-component.adoc       |  9 ++--
 .../modules/ROOT/pages/controlbus-component.adoc   | 17 +++++--
 .../modules/ROOT/pages/corda-component.adoc        |  9 ++--
 .../modules/ROOT/pages/couchbase-component.adoc    | 17 +++++--
 .../modules/ROOT/pages/couchdb-component.adoc      | 17 +++++--
 .../modules/ROOT/pages/cql-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/crypto-cms-component.adoc   |  9 ++--
 .../modules/ROOT/pages/crypto-component.adoc       |  9 ++--
 .../modules/ROOT/pages/crypto-dataformat.adoc      |  3 +-
 .../modules/ROOT/pages/cxf-component.adoc          |  9 ++--
 .../modules/ROOT/pages/cxfrs-component.adoc        |  9 ++--
 .../modules/ROOT/pages/dataformat-component.adoc   | 17 +++++--
 .../modules/ROOT/pages/dataset-component.adoc      | 17 +++++--
 .../modules/ROOT/pages/dataset-test-component.adoc | 19 ++++++--
 .../modules/ROOT/pages/digitalocean-component.adoc | 17 +++++--
 .../modules/ROOT/pages/direct-component.adoc       |  9 ++--
 .../modules/ROOT/pages/direct-vm-component.adoc    |  6 ++-
 .../modules/ROOT/pages/disruptor-component.adoc    | 10 ++--
 .../modules/ROOT/pages/dns-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/docker-component.adoc       |  9 ++--
 .../modules/ROOT/pages/dozer-component.adoc        | 17 +++++--
 .../modules/ROOT/pages/drill-component.adoc        | 17 +++++--
 .../modules/ROOT/pages/dropbox-component.adoc      | 17 +++++--
 .../modules/ROOT/pages/ehcache-component.adoc      |  9 ++--
 .../modules/ROOT/pages/ejb-component.adoc          |  6 ++-
 .../ROOT/pages/elasticsearch-rest-component.adoc   |  9 ++--
 .../modules/ROOT/pages/elsql-component.adoc        |  9 ++--
 .../modules/ROOT/pages/etcd-component.adoc         |  9 ++--
 .../modules/ROOT/pages/eventadmin-component.adoc   |  6 ++-
 .../modules/ROOT/pages/exec-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/facebook-component.adoc     |  9 ++--
 .../modules/ROOT/pages/file-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/flatpack-component.adoc     | 17 +++++--
 .../modules/ROOT/pages/flatpack-dataformat.adoc    |  3 +-
 .../modules/ROOT/pages/flink-component.adoc        |  9 ++--
 .../modules/ROOT/pages/fop-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/freemarker-component.adoc   |  9 ++--
 .../modules/ROOT/pages/ftp-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/ftps-component.adoc         |  9 ++--
 .../modules/ROOT/pages/ganglia-component.adoc      |  9 ++--
 .../modules/ROOT/pages/geocoder-component.adoc     | 17 +++++--
 .../modules/ROOT/pages/git-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/github-component.adoc       | 17 +++++--
 .../ROOT/pages/google-bigquery-component.adoc      |  9 ++--
 .../ROOT/pages/google-bigquery-sql-component.adoc  |  9 ++--
 .../ROOT/pages/google-calendar-component.adoc      |  9 ++--
 .../pages/google-calendar-stream-component.adoc    |  9 ++--
 .../modules/ROOT/pages/google-drive-component.adoc |  9 ++--
 .../modules/ROOT/pages/google-mail-component.adoc  |  9 ++--
 .../ROOT/pages/google-mail-stream-component.adoc   |  9 ++--
 .../ROOT/pages/google-pubsub-component.adoc        |  9 ++--
 .../ROOT/pages/google-sheets-component.adoc        |  9 ++--
 .../ROOT/pages/google-sheets-stream-component.adoc |  9 ++--
 .../modules/ROOT/pages/gora-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/grape-component.adoc        |  6 ++-
 .../modules/ROOT/pages/grpc-component.adoc         | 17 +++++--
 .../ROOT/pages/guava-eventbus-component.adoc       |  9 ++--
 .../pages/hazelcast-atomicvalue-component.adoc     |  9 ++--
 .../ROOT/pages/hazelcast-instance-component.adoc   |  9 ++--
 .../ROOT/pages/hazelcast-list-component.adoc       |  9 ++--
 .../ROOT/pages/hazelcast-map-component.adoc        |  9 ++--
 .../ROOT/pages/hazelcast-multimap-component.adoc   |  9 ++--
 .../ROOT/pages/hazelcast-queue-component.adoc      |  9 ++--
 .../pages/hazelcast-replicatedmap-component.adoc   |  9 ++--
 .../ROOT/pages/hazelcast-ringbuffer-component.adoc |  9 ++--
 .../ROOT/pages/hazelcast-seda-component.adoc       |  9 ++--
 .../ROOT/pages/hazelcast-set-component.adoc        |  9 ++--
 .../ROOT/pages/hazelcast-topic-component.adoc      |  9 ++--
 .../modules/ROOT/pages/hbase-component.adoc        |  9 ++--
 .../modules/ROOT/pages/hdfs2-component.adoc        |  9 ++--
 .../modules/ROOT/pages/hipchat-component.adoc      | 17 +++++--
 .../modules/ROOT/pages/http4-component.adoc        |  9 ++--
 .../ROOT/pages/iec60870-client-component.adoc      |  9 ++--
 .../ROOT/pages/iec60870-server-component.adoc      |  9 ++--
 .../modules/ROOT/pages/ignite-cache-component.adoc |  9 ++--
 .../ROOT/pages/ignite-compute-component.adoc       |  9 ++--
 .../ROOT/pages/ignite-events-component.adoc        |  9 ++--
 .../modules/ROOT/pages/ignite-idgen-component.adoc |  9 ++--
 .../ROOT/pages/ignite-messaging-component.adoc     |  9 ++--
 .../modules/ROOT/pages/ignite-queue-component.adoc |  9 ++--
 .../modules/ROOT/pages/ignite-set-component.adoc   |  9 ++--
 .../modules/ROOT/pages/infinispan-component.adoc   |  9 ++--
 .../modules/ROOT/pages/influxdb-component.adoc     | 17 +++++--
 .../modules/ROOT/pages/iota-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/ipfs-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/irc-component.adoc          |  9 ++--
 .../modules/ROOT/pages/ironmq-component.adoc       | 17 +++++--
 .../modules/ROOT/pages/jbpm-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/jcache-component.adoc       |  9 ++--
 .../modules/ROOT/pages/jclouds-component.adoc      |  9 ++--
 .../modules/ROOT/pages/jcr-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/jdbc-component.adoc         |  9 ++--
 .../modules/ROOT/pages/jetty-component.adoc        |  9 ++--
 .../modules/ROOT/pages/jgroups-component.adoc      |  9 ++--
 .../modules/ROOT/pages/jgroups-raft-component.adoc |  9 ++--
 .../modules/ROOT/pages/jing-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/jira-component.adoc         |  9 ++--
 .../modules/ROOT/pages/jms-component.adoc          |  9 ++--
 .../modules/ROOT/pages/jmx-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/jolt-component.adoc         |  9 ++--
 .../modules/ROOT/pages/jooq-component.adoc         |  9 ++--
 .../modules/ROOT/pages/jpa-component.adoc          |  9 ++--
 .../ROOT/pages/json-validator-component.adoc       | 17 +++++--
 .../modules/ROOT/pages/jt400-component.adoc        |  9 ++--
 .../modules/ROOT/pages/kafka-component.adoc        |  9 ++--
 .../pages/kubernetes-config-maps-component.adoc    | 17 +++++--
 .../pages/kubernetes-deployments-component.adoc    | 17 +++++--
 .../ROOT/pages/kubernetes-hpa-component.adoc       | 17 +++++--
 .../ROOT/pages/kubernetes-job-component.adoc       | 17 +++++--
 .../pages/kubernetes-namespaces-component.adoc     | 17 +++++--
 .../ROOT/pages/kubernetes-nodes-component.adoc     | 17 +++++--
 ...rnetes-persistent-volumes-claims-component.adoc | 17 +++++--
 .../kubernetes-persistent-volumes-component.adoc   | 17 +++++--
 .../ROOT/pages/kubernetes-pods-component.adoc      | 17 +++++--
 ...bernetes-replication-controllers-component.adoc | 17 +++++--
 .../kubernetes-resources-quota-component.adoc      | 17 +++++--
 .../ROOT/pages/kubernetes-secrets-component.adoc   | 17 +++++--
 .../kubernetes-service-accounts-component.adoc     | 17 +++++--
 .../ROOT/pages/kubernetes-services-component.adoc  | 17 +++++--
 .../modules/ROOT/pages/language-component.adoc     | 17 +++++--
 .../modules/ROOT/pages/ldap-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/ldif-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/log-component.adoc          |  9 ++--
 .../modules/ROOT/pages/lpr-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/lucene-component.adoc       |  9 ++--
 .../modules/ROOT/pages/lumberjack-component.adoc   |  9 ++--
 .../modules/ROOT/pages/mail-component.adoc         |  9 ++--
 .../modules/ROOT/pages/master-component.adoc       |  9 ++--
 .../modules/ROOT/pages/metrics-component.adoc      |  9 ++--
 .../modules/ROOT/pages/micrometer-component.adoc   |  9 ++--
 .../modules/ROOT/pages/milo-client-component.adoc  |  9 ++--
 .../modules/ROOT/pages/milo-server-component.adoc  |  9 ++--
 .../modules/ROOT/pages/mina2-component.adoc        |  9 ++--
 .../modules/ROOT/pages/mllp-component.adoc         |  9 ++--
 .../modules/ROOT/pages/mock-component.adoc         | 14 +++++-
 .../ROOT/pages/mongodb-gridfs-component.adoc       | 17 +++++--
 .../modules/ROOT/pages/mongodb3-component.adoc     | 17 +++++--
 .../modules/ROOT/pages/mqtt-component.adoc         |  9 ++--
 .../modules/ROOT/pages/msv-component.adoc          |  9 ++--
 .../modules/ROOT/pages/mustache-component.adoc     |  9 ++--
 .../modules/ROOT/pages/mvel-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/mvel-language.adoc          |  3 +-
 .../modules/ROOT/pages/mybatis-bean-component.adoc |  9 ++--
 .../modules/ROOT/pages/mybatis-component.adoc      |  9 ++--
 .../modules/ROOT/pages/nagios-component.adoc       |  9 ++--
 .../modules/ROOT/pages/nats-component.adoc         |  9 ++--
 .../modules/ROOT/pages/netty4-component.adoc       |  9 ++--
 .../modules/ROOT/pages/netty4-http-component.adoc  |  9 ++--
 .../modules/ROOT/pages/nsq-component.adoc          |  9 ++--
 .../pages/openshift-build-configs-component.adoc   | 14 +++++-
 .../ROOT/pages/openshift-builds-component.adoc     | 14 +++++-
 .../ROOT/pages/openstack-cinder-component.adoc     | 17 +++++--
 .../ROOT/pages/openstack-glance-component.adoc     | 17 +++++--
 .../ROOT/pages/openstack-keystone-component.adoc   | 17 +++++--
 .../ROOT/pages/openstack-neutron-component.adoc    | 17 +++++--
 .../ROOT/pages/openstack-nova-component.adoc       | 17 +++++--
 .../ROOT/pages/openstack-swift-component.adoc      | 17 +++++--
 .../modules/ROOT/pages/optaplanner-component.adoc  | 17 +++++--
 .../modules/ROOT/pages/paho-component.adoc         |  9 ++--
 .../modules/ROOT/pages/paxlogging-component.adoc   |  6 ++-
 .../modules/ROOT/pages/pdf-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/pgevent-component.adoc      | 17 +++++--
 .../modules/ROOT/pages/properties-component.adoc   |  9 ++--
 .../modules/ROOT/pages/pubnub-component.adoc       | 17 +++++--
 .../modules/ROOT/pages/pulsar-component.adoc       | 11 +++--
 .../modules/ROOT/pages/quartz2-component.adoc      |  9 ++--
 .../modules/ROOT/pages/quickfix-component.adoc     |  9 ++--
 .../modules/ROOT/pages/rabbitmq-component.adoc     |  9 ++--
 .../ROOT/pages/reactive-streams-component.adoc     |  9 ++--
 .../modules/ROOT/pages/ref-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/rest-api-component.adoc     | 17 +++++--
 .../modules/ROOT/pages/rest-component.adoc         |  9 ++--
 .../modules/ROOT/pages/rest-swagger-component.adoc |  9 ++--
 .../modules/ROOT/pages/restlet-component.adoc      |  9 ++--
 .../modules/ROOT/pages/rss-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/rss-dataformat.adoc         |  3 +-
 .../modules/ROOT/pages/saga-component.adoc         | 17 +++++--
 .../ROOT/pages/sap-netweaver-component.adoc        | 17 +++++--
 .../modules/ROOT/pages/scheduler-component.adoc    |  9 ++--
 .../modules/ROOT/pages/schematron-component.adoc   | 17 +++++--
 .../modules/ROOT/pages/scp-component.adoc          |  9 ++--
 .../modules/ROOT/pages/seda-component.adoc         |  9 ++--
 .../modules/ROOT/pages/service-component.adoc      |  9 ++--
 .../modules/ROOT/pages/servlet-component.adoc      |  9 ++--
 .../modules/ROOT/pages/sftp-component.adoc         | 14 +++++-
 .../modules/ROOT/pages/sip-component.adoc          | 17 +++++--
 .../modules/ROOT/pages/sjms-batch-component.adoc   |  9 ++--
 .../modules/ROOT/pages/sjms-component.adoc         |  9 ++--
 .../modules/ROOT/pages/sjms2-component.adoc        |  9 ++--
 .../modules/ROOT/pages/slack-component.adoc        |  9 ++--
 .../modules/ROOT/pages/smpp-component.adoc         |  9 ++--
 .../modules/ROOT/pages/snmp-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/solr-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/soroush-component.adoc      |  9 ++--
 .../modules/ROOT/pages/spark-component.adoc        |  9 ++--
 .../modules/ROOT/pages/spark-rest-component.adoc   |  6 ++-
 .../modules/ROOT/pages/splunk-component.adoc       |  9 ++--
 .../modules/ROOT/pages/spring-batch-component.adoc |  9 ++--
 .../modules/ROOT/pages/spring-event-component.adoc | 17 +++++--
 .../ROOT/pages/spring-integration-component.adoc   | 17 +++++--
 .../modules/ROOT/pages/spring-ldap-component.adoc  | 17 +++++--
 .../modules/ROOT/pages/spring-redis-component.adoc | 17 +++++--
 .../modules/ROOT/pages/spring-ws-component.adoc    |  9 ++--
 .../modules/ROOT/pages/sql-component.adoc          |  9 ++--
 .../modules/ROOT/pages/sql-stored-component.adoc   |  9 ++--
 .../modules/ROOT/pages/ssh-component.adoc          |  9 ++--
 .../modules/ROOT/pages/stax-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/stomp-component.adoc        |  9 ++--
 .../modules/ROOT/pages/stream-component.adoc       | 17 +++++--
 .../ROOT/pages/string-template-component.adoc      | 17 +++++--
 .../modules/ROOT/pages/stub-component.adoc         |  9 ++--
 .../modules/ROOT/pages/telegram-component.adoc     |  9 ++--
 .../modules/ROOT/pages/thrift-component.adoc       |  9 ++--
 .../modules/ROOT/pages/thrift-dataformat.adoc      |  3 +-
 .../modules/ROOT/pages/tika-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/timer-component.adoc        | 17 +++++--
 .../modules/ROOT/pages/twilio-component.adoc       |  9 ++--
 .../pages/twitter-directmessage-component.adoc     |  9 ++--
 .../ROOT/pages/twitter-search-component.adoc       |  9 ++--
 .../ROOT/pages/twitter-streaming-component.adoc    |  9 ++--
 .../ROOT/pages/twitter-timeline-component.adoc     |  9 ++--
 .../modules/ROOT/pages/undertow-component.adoc     |  9 ++--
 .../modules/ROOT/pages/validator-component.adoc    |  9 ++--
 .../modules/ROOT/pages/velocity-component.adoc     |  9 ++--
 .../modules/ROOT/pages/vertx-component.adoc        |  9 ++--
 .../modules/ROOT/pages/vm-component.adoc           |  9 ++--
 .../modules/ROOT/pages/weather-component.adoc      |  9 ++--
 .../modules/ROOT/pages/web3j-component.adoc        |  9 ++--
 .../modules/ROOT/pages/webhook-component.adoc      |  9 ++--
 .../modules/ROOT/pages/websocket-component.adoc    |  9 ++--
 .../ROOT/pages/websocket-jsr356-component.adoc     | 17 +++++--
 .../modules/ROOT/pages/wordpress-component.adoc    |  9 ++--
 .../modules/ROOT/pages/xchange-component.adoc      | 17 +++++--
 .../modules/ROOT/pages/xmlsecurity-component.adoc  |  9 ++--
 .../modules/ROOT/pages/xmpp-component.adoc         | 17 +++++--
 .../modules/ROOT/pages/xquery-component.adoc       |  9 ++--
 .../modules/ROOT/pages/xquery-language.adoc        |  3 +-
 .../modules/ROOT/pages/xslt-component.adoc         |  9 ++--
 .../modules/ROOT/pages/yammer-component.adoc       |  9 ++--
 .../modules/ROOT/pages/zendesk-component.adoc      |  9 ++--
 .../modules/ROOT/pages/zookeeper-component.adoc    |  9 ++--
 .../ROOT/pages/zookeeper-master-component.adoc     |  9 ++--
 .../src/main/resources/application.properties      |  4 ++
 .../springboot/ActiveMQComponentConfiguration.java | 13 +++++
 .../ahc/springboot/AhcComponentConfiguration.java  | 13 +++++
 .../ws/springboot/WsComponentConfiguration.java    | 13 +++++
 .../springboot/AMQPComponentConfiguration.java     | 13 +++++
 .../springboot/ApnsComponentConfiguration.java     | 13 +++++
 .../as2/springboot/AS2ComponentConfiguration.java  | 13 +++++
 .../springboot/AsteriskComponentConfiguration.java | 13 +++++
 .../springboot/AtmosComponentConfiguration.java    | 13 +++++
 .../WebsocketComponentConfiguration.java           | 13 +++++
 .../springboot/AtomComponentConfiguration.java     | 13 +++++
 .../AtomixMapComponentConfiguration.java           | 13 +++++
 .../AtomixMessagingComponentConfiguration.java     | 13 +++++
 .../AtomixMultiMapComponentConfiguration.java      | 13 +++++
 .../AtomixQueueComponentConfiguration.java         | 13 +++++
 .../AtomixSetComponentConfiguration.java           | 13 +++++
 .../AtomixValueComponentConfiguration.java         | 13 +++++
 .../springboot/AvroComponentConfiguration.java     | 13 +++++
 .../cw/springboot/CwComponentConfiguration.java    | 13 +++++
 .../ddb/springboot/DdbComponentConfiguration.java  | 13 +++++
 .../DdbStreamComponentConfiguration.java           | 13 +++++
 .../ec2/springboot/EC2ComponentConfiguration.java  | 13 +++++
 .../ecs/springboot/ECSComponentConfiguration.java  | 13 +++++
 .../eks/springboot/EKSComponentConfiguration.java  | 13 +++++
 .../iam/springboot/IAMComponentConfiguration.java  | 13 +++++
 .../KinesisFirehoseComponentConfiguration.java     | 13 +++++
 .../springboot/KinesisComponentConfiguration.java  | 13 +++++
 .../kms/springboot/KMSComponentConfiguration.java  | 13 +++++
 .../springboot/LambdaComponentConfiguration.java   | 13 +++++
 .../mq/springboot/MQComponentConfiguration.java    | 13 +++++
 .../msk/springboot/MSKComponentConfiguration.java  | 13 +++++
 .../s3/springboot/S3ComponentConfiguration.java    | 13 +++++
 .../sdb/springboot/SdbComponentConfiguration.java  | 13 +++++
 .../ses/springboot/SesComponentConfiguration.java  | 13 +++++
 .../sns/springboot/SnsComponentConfiguration.java  | 13 +++++
 .../sqs/springboot/SqsComponentConfiguration.java  | 13 +++++
 .../swf/springboot/SWFComponentConfiguration.java  | 13 +++++
 .../BlobServiceComponentConfiguration.java         | 13 +++++
 .../QueueServiceComponentConfiguration.java        | 13 +++++
 .../springboot/BeanComponentConfiguration.java     | 13 +++++
 .../springboot/ClassComponentConfiguration.java    | 13 +++++
 .../BeanValidatorComponentConfiguration.java       | 13 +++++
 .../BeanstalkComponentConfiguration.java           | 13 +++++
 .../springboot/BonitaComponentConfiguration.java   | 13 +++++
 .../box/springboot/BoxComponentConfiguration.java  | 13 +++++
 .../BraintreeComponentConfiguration.java           | 13 +++++
 .../springboot/BrowseComponentConfiguration.java   | 13 +++++
 .../CaffeineCacheComponentConfiguration.java       | 13 +++++
 .../CaffeineLoadCacheComponentConfiguration.java   | 13 +++++
 .../CassandraComponentConfiguration.java           | 13 +++++
 .../ChatScriptComponentConfiguration.java          | 13 +++++
 .../springboot/ChunkComponentConfiguration.java    | 13 +++++
 .../cm/springboot/CMComponentConfiguration.java    | 13 +++++
 .../springboot/CMISComponentConfiguration.java     | 13 +++++
 .../springboot/CoAPComponentConfiguration.java     | 13 +++++
 .../springboot/CometdComponentConfiguration.java   | 13 +++++
 .../springboot/ConsulComponentConfiguration.java   | 13 +++++
 .../ControlBusComponentConfiguration.java          | 13 +++++
 .../springboot/CordaComponentConfiguration.java    | 13 +++++
 .../CouchbaseComponentConfiguration.java           | 13 +++++
 .../springboot/CouchDbComponentConfiguration.java  | 13 +++++
 .../CryptoCmsComponentConfiguration.java           | 13 +++++
 .../DigitalSignatureComponentConfiguration.java    | 13 +++++
 .../springboot/CxfRsComponentConfiguration.java    | 13 +++++
 .../cxf/springboot/CxfComponentConfiguration.java  | 13 +++++
 .../DataFormatComponentConfiguration.java          | 13 +++++
 .../springboot/DataSetComponentConfiguration.java  | 13 +++++
 .../DataSetTestComponentConfiguration.java         | 13 +++++
 .../DigitalOceanComponentConfiguration.java        | 13 +++++
 .../springboot/DirectComponentConfiguration.java   | 13 +++++
 .../springboot/DirectVmComponentConfiguration.java | 13 +++++
 .../DisruptorComponentConfiguration.java           | 13 +++++
 .../DisruptorVmComponentConfiguration.java         | 13 +++++
 .../dns/springboot/DnsComponentConfiguration.java  | 13 +++++
 .../springboot/DockerComponentConfiguration.java   | 13 +++++
 .../springboot/DozerComponentConfiguration.java    | 13 +++++
 .../springboot/DrillComponentConfiguration.java    | 13 +++++
 .../springboot/DropboxComponentConfiguration.java  | 13 +++++
 .../springboot/EhcacheComponentConfiguration.java  | 13 +++++
 .../ElasticsearchComponentConfiguration.java       | 13 +++++
 .../springboot/ElsqlComponentConfiguration.java    | 13 +++++
 .../springboot/EtcdComponentConfiguration.java     | 13 +++++
 .../springboot/ExecComponentConfiguration.java     | 13 +++++
 .../springboot/FacebookComponentConfiguration.java | 13 +++++
 .../springboot/FhirComponentConfiguration.java     | 13 +++++
 .../springboot/FileComponentConfiguration.java     | 13 +++++
 .../springboot/FlatpackComponentConfiguration.java | 13 +++++
 .../springboot/FlinkComponentConfiguration.java    | 13 +++++
 .../fop/springboot/FopComponentConfiguration.java  | 13 +++++
 .../FreemarkerComponentConfiguration.java          | 13 +++++
 .../springboot/FtpComponentConfiguration.java      | 13 +++++
 .../springboot/FtpsComponentConfiguration.java     | 13 +++++
 .../springboot/SftpComponentConfiguration.java     | 13 +++++
 .../springboot/GangliaComponentConfiguration.java  | 13 +++++
 .../springboot/GeoCoderComponentConfiguration.java | 13 +++++
 .../git/springboot/GitComponentConfiguration.java  | 13 +++++
 .../springboot/GitHubComponentConfiguration.java   | 13 +++++
 .../GoogleBigQueryComponentConfiguration.java      | 13 +++++
 .../GoogleBigQuerySQLComponentConfiguration.java   | 13 +++++
 .../GoogleCalendarComponentConfiguration.java      | 13 +++++
 ...GoogleCalendarStreamComponentConfiguration.java | 13 +++++
 .../GoogleDriveComponentConfiguration.java         | 13 +++++
 .../GoogleMailComponentConfiguration.java          | 13 +++++
 .../GoogleMailStreamComponentConfiguration.java    | 13 +++++
 .../GooglePubsubComponentConfiguration.java        | 13 +++++
 .../GoogleSheetsComponentConfiguration.java        | 13 +++++
 .../GoogleSheetsStreamComponentConfiguration.java  | 13 +++++
 .../springboot/GoraComponentConfiguration.java     | 13 +++++
 .../springboot/GrpcComponentConfiguration.java     | 13 +++++
 .../GuavaEventBusComponentConfiguration.java       | 13 +++++
 ...azelcastAtomicnumberComponentConfiguration.java | 13 +++++
 .../HazelcastInstanceComponentConfiguration.java   | 13 +++++
 .../HazelcastListComponentConfiguration.java       | 13 +++++
 .../HazelcastMapComponentConfiguration.java        | 13 +++++
 .../HazelcastMultimapComponentConfiguration.java   | 13 +++++
 .../HazelcastQueueComponentConfiguration.java      | 13 +++++
 ...zelcastReplicatedmapComponentConfiguration.java | 13 +++++
 .../HazelcastRingbufferComponentConfiguration.java | 13 +++++
 .../HazelcastSedaComponentConfiguration.java       | 13 +++++
 .../HazelcastSetComponentConfiguration.java        | 13 +++++
 .../HazelcastTopicComponentConfiguration.java      | 13 +++++
 .../springboot/HBaseComponentConfiguration.java    | 13 +++++
 .../springboot/HdfsComponentConfiguration.java     | 13 +++++
 .../springboot/HipchatComponentConfiguration.java  | 13 +++++
 .../springboot/HttpComponentConfiguration.java     | 13 +++++
 .../springboot/ClientComponentConfiguration.java   | 13 +++++
 .../springboot/ServerComponentConfiguration.java   | 13 +++++
 .../IgniteCacheComponentConfiguration.java         | 13 +++++
 .../IgniteComputeComponentConfiguration.java       | 13 +++++
 .../IgniteEventsComponentConfiguration.java        | 13 +++++
 .../IgniteIdGenComponentConfiguration.java         | 13 +++++
 .../IgniteMessagingComponentConfiguration.java     | 13 +++++
 .../IgniteQueueComponentConfiguration.java         | 13 +++++
 .../IgniteSetComponentConfiguration.java           | 13 +++++
 .../InfinispanComponentConfiguration.java          | 13 +++++
 .../springboot/InfluxDbComponentConfiguration.java | 13 +++++
 .../springboot/IOTAComponentConfiguration.java     | 13 +++++
 .../springboot/IPFSComponentConfiguration.java     | 13 +++++
 .../irc/springboot/IrcComponentConfiguration.java  | 13 +++++
 .../springboot/IronMQComponentConfiguration.java   | 13 +++++
 .../springboot/JBPMComponentConfiguration.java     | 13 +++++
 .../springboot/JCacheComponentConfiguration.java   | 13 +++++
 .../springboot/JcloudsComponentConfiguration.java  | 13 +++++
 .../jcr/springboot/JcrComponentConfiguration.java  | 13 +++++
 .../springboot/JdbcComponentConfiguration.java     | 13 +++++
 .../JettyHttpComponentConfiguration9.java          | 13 +++++
 .../JGroupsRaftComponentConfiguration.java         | 13 +++++
 .../springboot/JGroupsComponentConfiguration.java  | 13 +++++
 .../springboot/JingComponentConfiguration.java     | 13 +++++
 .../springboot/JiraComponentConfiguration.java     | 13 +++++
 .../jms/springboot/JmsComponentConfiguration.java  | 13 +++++
 .../jmx/springboot/JMXComponentConfiguration.java  | 13 +++++
 .../springboot/JoltComponentConfiguration.java     | 13 +++++
 .../springboot/JooqComponentConfiguration.java     | 13 +++++
 .../jpa/springboot/JpaComponentConfiguration.java  | 13 +++++
 .../scp/springboot/ScpComponentConfiguration.java  | 13 +++++
 .../JsonValidatorComponentConfiguration.java       | 13 +++++
 .../springboot/Jt400ComponentConfiguration.java    | 13 +++++
 .../springboot/KafkaComponentConfiguration.java    | 13 +++++
 ...KubernetesConfigMapsComponentConfiguration.java | 13 +++++
 ...ubernetesDeploymentsComponentConfiguration.java | 13 +++++
 .../KubernetesHPAComponentConfiguration.java       | 13 +++++
 .../KubernetesJobComponentConfiguration.java       | 13 +++++
 ...KubernetesNamespacesComponentConfiguration.java | 13 +++++
 .../KubernetesNodesComponentConfiguration.java     | 13 +++++
 ...tesPersistentVolumesComponentConfiguration.java | 13 +++++
 ...sistentVolumesClaimsComponentConfiguration.java | 13 +++++
 .../KubernetesPodsComponentConfiguration.java      | 13 +++++
 ...plicationControllersComponentConfiguration.java | 13 +++++
 ...rnetesResourcesQuotaComponentConfiguration.java | 13 +++++
 .../KubernetesSecretsComponentConfiguration.java   | 13 +++++
 ...netesServiceAccountsComponentConfiguration.java | 13 +++++
 .../KubernetesServicesComponentConfiguration.java  | 13 +++++
 ...penshiftBuildConfigsComponentConfiguration.java | 13 +++++
 .../OpenshiftBuildsComponentConfiguration.java     | 13 +++++
 .../springboot/LanguageComponentConfiguration.java | 13 +++++
 .../springboot/LdapComponentConfiguration.java     | 13 +++++
 .../springboot/LdifComponentConfiguration.java     | 13 +++++
 .../springboot/LinkedInComponentConfiguration.java | 13 +++++
 .../log/springboot/LogComponentConfiguration.java  | 13 +++++
 .../springboot/LuceneComponentConfiguration.java   | 13 +++++
 .../LumberjackComponentConfiguration.java          | 13 +++++
 .../springboot/MailComponentConfiguration.java     | 13 +++++
 .../springboot/MasterComponentConfiguration.java   | 13 +++++
 .../springboot/MetricsComponentConfiguration.java  | 13 +++++
 .../MicrometerComponentConfiguration.java          | 13 +++++
 .../MiloClientComponentConfiguration.java          | 13 +++++
 .../MiloServerComponentConfiguration.java          | 13 +++++
 .../springboot/Mina2ComponentConfiguration.java    | 13 +++++
 .../springboot/MllpComponentConfiguration.java     | 13 +++++
 .../springboot/MockComponentConfiguration.java     | 13 +++++
 .../springboot/GridFsComponentConfiguration.java   | 13 +++++
 .../springboot/MongoDbComponentConfiguration.java  | 13 +++++
 .../springboot/MQTTComponentConfiguration.java     | 13 +++++
 .../msv/springboot/MsvComponentConfiguration.java  | 13 +++++
 .../springboot/MustacheComponentConfiguration.java | 13 +++++
 .../springboot/MvelComponentConfiguration.java     | 13 +++++
 .../MyBatisBeanComponentConfiguration.java         | 13 +++++
 .../springboot/MyBatisComponentConfiguration.java  | 13 +++++
 .../springboot/NagiosComponentConfiguration.java   | 13 +++++
 .../springboot/NatsComponentConfiguration.java     | 13 +++++
 .../NettyHttpComponentConfiguration.java           | 13 +++++
 .../springboot/NettyComponentConfiguration.java    | 13 +++++
 .../nsq/springboot/NsqComponentConfiguration.java  | 13 +++++
 .../springboot/Olingo2ComponentConfiguration.java  | 13 +++++
 .../springboot/Olingo4ComponentConfiguration.java  | 13 +++++
 .../springboot/CinderComponentConfiguration.java   | 13 +++++
 .../springboot/GlanceComponentConfiguration.java   | 13 +++++
 .../springboot/KeystoneComponentConfiguration.java | 13 +++++
 .../springboot/NeutronComponentConfiguration.java  | 13 +++++
 .../springboot/NovaComponentConfiguration.java     | 13 +++++
 .../springboot/SwiftComponentConfiguration.java    | 13 +++++
 .../OptaPlannerComponentConfiguration.java         | 13 +++++
 .../springboot/PahoComponentConfiguration.java     | 13 +++++
 .../pdf/springboot/PdfComponentConfiguration.java  | 13 +++++
 .../springboot/PgEventComponentConfiguration.java  | 13 +++++
 .../springboot/PrinterComponentConfiguration.java  | 13 +++++
 .../PropertiesComponentConfiguration.java          | 13 +++++
 .../springboot/PubNubComponentConfiguration.java   | 13 +++++
 .../springboot/PulsarComponentConfiguration.java   | 13 +++++
 .../springboot/QuartzComponentConfiguration.java   | 13 +++++
 .../QuickfixjComponentConfiguration.java           | 13 +++++
 .../springboot/RabbitMQComponentConfiguration.java | 13 +++++
 .../ReactiveStreamsComponentConfiguration.java     | 13 +++++
 .../ref/springboot/RefComponentConfiguration.java  | 13 +++++
 .../springboot/RestApiComponentConfiguration.java  | 13 +++++
 .../springboot/RestComponentConfiguration.java     | 13 +++++
 .../RestSwaggerComponentConfiguration.java         | 13 +++++
 .../springboot/RestletComponentConfiguration.java  | 13 +++++
 .../rss/springboot/RssComponentConfiguration.java  | 13 +++++
 .../springboot/SagaComponentConfiguration.java     | 13 +++++
 .../SalesforceComponentConfiguration.java          | 13 +++++
 .../NetWeaverComponentConfiguration.java           | 13 +++++
 .../springboot/XQueryComponentConfiguration.java   | 13 +++++
 .../SchedulerComponentConfiguration.java           | 13 +++++
 .../SchematronComponentConfiguration.java          | 13 +++++
 .../springboot/SedaComponentConfiguration.java     | 13 +++++
 .../springboot/ServiceComponentConfiguration.java  | 13 +++++
 .../ServiceNowComponentConfiguration.java          | 13 +++++
 .../springboot/ServletComponentConfiguration.java  | 13 +++++
 .../sip/springboot/SipComponentConfiguration.java  | 13 +++++
 .../SjmsBatchComponentConfiguration.java           | 13 +++++
 .../springboot/SjmsComponentConfiguration.java     | 13 +++++
 .../springboot/Sjms2ComponentConfiguration.java    | 13 +++++
 .../springboot/SlackComponentConfiguration.java    | 13 +++++
 .../springboot/SmppComponentConfiguration.java     | 13 +++++
 .../springboot/SnmpComponentConfiguration.java     | 13 +++++
 .../springboot/SolrComponentConfiguration.java     | 13 +++++
 .../SoroushBotComponentConfiguration.java          | 13 +++++
 .../springboot/SparkComponentConfiguration.java    | 13 +++++
 .../springboot/SplunkComponentConfiguration.java   | 13 +++++
 .../SpringBatchComponentConfiguration.java         | 13 +++++
 .../SpringIntegrationComponentConfiguration.java   | 13 +++++
 .../SpringLdapComponentConfiguration.java          | 13 +++++
 .../springboot/RedisComponentConfiguration.java    | 13 +++++
 .../springboot/EventComponentConfiguration.java    | 13 +++++
 .../SpringWebserviceComponentConfiguration.java    | 13 +++++
 .../sql/springboot/SqlComponentConfiguration.java  | 13 +++++
 .../SqlStoredComponentConfiguration.java           | 13 +++++
 .../ssh/springboot/SshComponentConfiguration.java  | 13 +++++
 .../springboot/StAXComponentConfiguration.java     | 13 +++++
 .../springboot/StompComponentConfiguration.java    | 13 +++++
 .../springboot/StreamComponentConfiguration.java   | 13 +++++
 .../StringTemplateComponentConfiguration.java      | 13 +++++
 .../springboot/StubComponentConfiguration.java     | 13 +++++
 .../springboot/TelegramComponentConfiguration.java | 13 +++++
 .../springboot/ThriftComponentConfiguration.java   | 13 +++++
 .../springboot/TikaComponentConfiguration.java     | 13 +++++
 .../springboot/TimerComponentConfiguration.java    | 13 +++++
 .../springboot/TwilioComponentConfiguration.java   | 13 +++++
 ...TwitterDirectMessageComponentConfiguration.java | 13 +++++
 .../TwitterSearchComponentConfiguration.java       | 13 +++++
 .../TwitterStreamingComponentConfiguration.java    | 13 +++++
 .../TwitterTimelineComponentConfiguration.java     | 13 +++++
 .../springboot/UndertowComponentConfiguration.java | 13 +++++
 .../ValidatorComponentConfiguration.java           | 13 +++++
 .../springboot/VelocityComponentConfiguration.java | 13 +++++
 .../springboot/VertxComponentConfiguration.java    | 13 +++++
 .../vm/springboot/VmComponentConfiguration.java    | 13 +++++
 .../springboot/WeatherComponentConfiguration.java  | 13 +++++
 .../springboot/Web3jComponentConfiguration.java    | 13 +++++
 .../springboot/WebhookComponentConfiguration.java  | 13 +++++
 .../JSR356WebSocketComponentConfiguration.java     | 13 +++++
 .../WebsocketComponentConfiguration.java           | 13 +++++
 .../WordpressComponentConfiguration.java           | 13 +++++
 .../springboot/XChangeComponentConfiguration.java  | 13 +++++
 .../XmlSignatureComponentConfiguration.java        | 13 +++++
 .../springboot/XmppComponentConfiguration.java     | 13 +++++
 .../springboot/XsltComponentConfiguration.java     | 13 +++++
 .../springboot/YammerComponentConfiguration.java   | 13 +++++
 .../springboot/ZendeskComponentConfiguration.java  | 13 +++++
 .../springboot/MasterComponentConfiguration.java   | 13 +++++
 .../ZooKeeperComponentConfiguration.java           | 13 +++++
 900 files changed, 8885 insertions(+), 1875 deletions(-)
 delete mode 100644 core/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java

Reply | Threaded
Open this post in threaded view
|

[camel] 01/06: CAMEL-13566: IntrospectionSupport - Remove old legacy JDK PropertyEditor

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

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

commit fda0ba7b5ff2897cecd495c2d494bebdc4cae85f
Author: Claus Ibsen <[hidden email]>
AuthorDate: Fri May 24 08:35:07 2019 +0200

    CAMEL-13566: IntrospectionSupport - Remove old legacy JDK PropertyEditor
---
 .../apache/camel/support/IntrospectionSupport.java | 33 ++--------------------
 .../camel/support/PropertyBindingSupport.java      |  1 -
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
index 6af2cec..17d8d79 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
@@ -16,13 +16,9 @@
  */
 package org.apache.camel.support;
 
-import java.beans.PropertyEditor;
-import java.beans.PropertyEditorManager;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
-import java.net.URI;
-import java.net.URISyntaxException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -68,7 +64,6 @@ public final class IntrospectionSupport {
     // which could prevent classloader to unload classes if being referenced from this cache
     @SuppressWarnings("unchecked")
     private static final Map<Class<?>, ClassInfo> CACHE = LRUCacheFactory.newLRUWeakCache(1000);
-    private static final Object LOCK = new Object();
     private static final Pattern SECRETS = Pattern.compile(".*(passphrase|password|secretKey).*", Pattern.CASE_INSENSITIVE);
 
     static {
@@ -136,9 +131,6 @@ public final class IntrospectionSupport {
             LOG.debug("Clearing cache[size={}, hits={}, misses={}, evicted={}]", localCache.size(), localCache.getHits(), localCache.getMisses(), localCache.getEvicted());
         }
         CACHE.clear();
-
-        // flush java beans introspector as it may be in use by the PropertyEditor
-        java.beans.Introspector.flushCaches();
     }
 
     public static boolean isGetter(Method method) {
@@ -610,13 +602,13 @@ public final class IntrospectionSupport {
                         return true;
                     } else {
                         // We need to convert it
-                        Object convertedValue = convert(typeConverter, parameterType, ref);
+                        Object convertedValue = typeConverter.convertTo(parameterType, ref);
                         // we may want to set options on classes that has package view visibility, so override the accessible
                         setter.setAccessible(true);
                         setter.invoke(target, convertedValue);
                         if (LOG.isTraceEnabled()) {
                             // hide sensitive data
-                            String val = ref != null ? ref.toString() : "";
+                            String val = ref.toString();
                             if (SECRETS.matcher(name).find()) {
                                 val = "xxxxxx";
                             }
@@ -695,27 +687,6 @@ public final class IntrospectionSupport {
         return setProperty(target, name, value, true);
     }
 
-    static Object convert(TypeConverter typeConverter, Class<?> type, Object value)
-        throws URISyntaxException, NoTypeConversionAvailableException {
-        if (typeConverter != null) {
-            return typeConverter.mandatoryConvertTo(type, value);
-        }
-        if (type == URI.class) {
-            return new URI(value.toString());
-        }
-        PropertyEditor editor = PropertyEditorManager.findEditor(type);
-        if (editor != null) {
-            // property editor is not thread safe, so we need to lock
-            Object answer;
-            synchronized (LOCK) {
-                editor.setAsText(value.toString());
-                answer = editor.getValue();
-            }
-            return answer;
-        }
-        return null;
-    }
-
     public static Set<Method> findSetterMethods(Class<?> clazz, String name, boolean allowBuilderPattern) {
         Set<Method> candidates = new LinkedHashSet<>();
 
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
index 79916c9..cddf4fe 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/PropertyBindingSupport.java
@@ -44,7 +44,6 @@ import static org.apache.camel.support.IntrospectionSupport.getOrElseProperty;
 public final class PropertyBindingSupport {
 
     // TODO: Add support for Map/List
-    // TODO: Add option to turn this binding on|off on component/endpoint level
 
     /**
      * To use a fluent builder style to configure this property binding support.

Reply | Threaded
Open this post in threaded view
|

[camel] 02/06: CAMEL-13569: JndiContext - Remove old bean binding

davsclaus-2
In reply to this post by davsclaus-2
This is an automated email from the ASF dual-hosted git repository.

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

commit d0b64ac2cfe0e233bad89cea6248887d98e80d76
Author: Claus Ibsen <[hidden email]>
AuthorDate: Fri May 24 10:30:23 2019 +0200

    CAMEL-13569: JndiContext - Remove old bean binding
---
 .../src/test/resources/jndi-example.properties     |  4 ----
 .../apache/camel/support/IntrospectionSupport.java |  2 +-
 .../org/apache/camel/support/jndi/JndiContext.java | 23 +---------------------
 3 files changed, 2 insertions(+), 27 deletions(-)

diff --git a/core/camel-core/src/test/resources/jndi-example.properties b/core/camel-core/src/test/resources/jndi-example.properties
index d2e1869..3807dfc 100644
--- a/core/camel-core/src/test/resources/jndi-example.properties
+++ b/core/camel-core/src/test/resources/jndi-example.properties
@@ -21,8 +21,4 @@ java.naming.factory.initial = org.apache.camel.support.jndi.CamelInitialContextF
 # the following properties will be copied into the context
 foo = bar
 
-example.class = org.apache.camel.support.jndi.ExampleBean
-example.name = James
-example.price = 2.34
-
 # END SNIPPET: jndi
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
index 17d8d79..c238b85 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
@@ -602,7 +602,7 @@ public final class IntrospectionSupport {
                         return true;
                     } else {
                         // We need to convert it
-                        Object convertedValue = typeConverter.convertTo(parameterType, ref);
+                        Object convertedValue = typeConverter != null ? typeConverter.convertTo(parameterType, ref) : ref;
                         // we may want to set options on classes that has package view visibility, so override the accessible
                         setter.setAccessible(true);
                         setter.invoke(target, convertedValue);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
index 694080d..caca560 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
@@ -96,28 +96,7 @@ public class JndiContext implements Context, Serializable {
      * properties set on the injected bean
      */
     public static Map<String, Object> createBindingsMapFromEnvironment(Hashtable<String, Object> env) throws Exception {
-        Map<String, Object> answer = new HashMap<>(env);
-
-        for (Map.Entry<String, Object> entry : env.entrySet()) {
-            String key = entry.getKey();
-            Object value = entry.getValue();
-
-            if (key != null && value instanceof String) {
-                String valueText = (String)value;
-                if (key.endsWith(".class")) {
-                    Class<?> type = org.apache.camel.util.ObjectHelper.loadClass(valueText);
-                    if (type != null) {
-                        String newEntry = key.substring(0, key.length() - ".class".length());
-                        Object bean = createBean(type, answer, newEntry + ".");
-                        if (bean != null) {
-                            answer.put(newEntry, bean);
-                        }
-                    }
-                }
-            }
-        }
-
-        return answer;
+        return new HashMap<>();
     }
 
     public void freeze() {

Reply | Threaded
Open this post in threaded view
|

[camel] 03/06: CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.

davsclaus-2
In reply to this post by davsclaus-2
This is an automated email from the ASF dual-hosted git repository.

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

commit 7de0d6c383b33b6cb41df7c25a4215c5988b1e7c
Author: Claus Ibsen <[hidden email]>
AuthorDate: Fri May 24 11:02:07 2019 +0200

    CAMEL-13557: Add property binding support to make it convenient to configure components and whatnot.
---
 .../java/org/apache/camel/impl/RegistryTest.java   | 56 ----------------------
 .../camel/support/IntrospectionSupportTest.java    |  6 +--
 .../org/apache/camel/support/jndi/JndiTest.java    | 11 +----
 .../apache/camel/support/IntrospectionSupport.java |  6 ++-
 .../org/apache/camel/support/jndi/JndiContext.java |  2 +-
 5 files changed, 9 insertions(+), 72 deletions(-)

diff --git a/core/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java b/core/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java
deleted file mode 100644
index ad5da1d..0000000
--- a/core/camel-core/src/test/java/org/apache/camel/impl/RegistryTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.camel.impl;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.camel.support.jndi.JndiTest;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-
-public class RegistryTest extends Assert {
-    protected JndiRegistry registry;
-
-    @Test
-    public void testBind() throws Exception {
-        List<?> foo = Arrays.asList("a", "b", "c");
-
-        registry.bind("foo", foo);
-
-        List<?> list = registry.lookupByNameAndType("foo", List.class);
-        assertEquals("Should be same!", foo, list);
-    }
-
-    @Test
-    public void testDefaultProviderAllowsValuesToBeCreatedInThePropertiesFile() throws Exception {
-        Object value = registry.lookupByName("foo");
-        assertEquals("lookup of foo", "bar", value);
-    }
-
-    @Test
-    public void testLookupOfUnknownName() throws Exception {
-        Object value = registry.lookupByName("No such entry!");
-        assertNull("Should not find anything!", value);
-    }
-
-    @Before
-    public void setUp() throws Exception {
-
-        registry = new JndiRegistry(JndiTest.createInitialContext());
-    }
-}
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/IntrospectionSupportTest.java b/core/camel-core/src/test/java/org/apache/camel/support/IntrospectionSupportTest.java
index 874fe41..0088941 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/IntrospectionSupportTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/IntrospectionSupportTest.java
@@ -357,7 +357,7 @@ public class IntrospectionSupportTest extends ContextTestSupport {
         bean.setName("Claus");
         bean.setPrice(10.0);
 
-        IntrospectionSupport.setProperty(bean, "name", "James");
+        IntrospectionSupport.setProperty(context, bean, "name", "James");
         assertEquals("James", bean.getName());
     }
 
@@ -371,8 +371,8 @@ public class IntrospectionSupportTest extends ContextTestSupport {
         bean.setGoldCustomer(true);
         bean.setLittle(true);
 
-        IntrospectionSupport.setProperty(bean, "name", "James");
-        IntrospectionSupport.setProperty(bean, "gold-customer", "false");
+        IntrospectionSupport.setProperty(context, bean, "name", "James");
+        IntrospectionSupport.setProperty(context, bean, "gold-customer", "false");
         assertEquals("James", bean.getName());
         assertEquals(false, bean.isGoldCustomer());
     }
diff --git a/core/camel-core/src/test/java/org/apache/camel/support/jndi/JndiTest.java b/core/camel-core/src/test/java/org/apache/camel/support/jndi/JndiTest.java
index 015ea1b..c8ce1ef 100644
--- a/core/camel-core/src/test/java/org/apache/camel/support/jndi/JndiTest.java
+++ b/core/camel-core/src/test/java/org/apache/camel/support/jndi/JndiTest.java
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 package org.apache.camel.support.jndi;
+
 import java.io.InputStream;
 import java.util.Hashtable;
 import java.util.Properties;
@@ -49,16 +50,6 @@ public class JndiTest extends TestSupport {
         assertEquals("foo", "bar", value);
     }
 
-    @Test
-    public void testLookupOfTypedObject() throws Exception {
-        Object value = assertLookup("example");
-        ExampleBean bean = assertIsInstanceOf(ExampleBean.class, value);
-        assertEquals("Bean.name", "James", bean.getName());
-        assertEquals("Bean.price", 2.34d, bean.getPrice(), 1e-5d);
-
-        log.info("Found bean: " + bean);
-    }
-
     protected Object assertLookup(String name) throws NamingException {
         Object value = context.lookup(name);
         assertNotNull("Should have found JNDI entry: " + name + " in context: " + context, value);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java b/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
index c238b85..fc62a37 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/IntrospectionSupport.java
@@ -602,7 +602,7 @@ public final class IntrospectionSupport {
                         return true;
                     } else {
                         // We need to convert it
-                        Object convertedValue = typeConverter != null ? typeConverter.convertTo(parameterType, ref) : ref;
+                        Object convertedValue = typeConverter != null ? typeConverter.mandatoryConvertTo(parameterType, ref) : ref;
                         // we may want to set options on classes that has package view visibility, so override the accessible
                         setter.setAccessible(true);
                         setter.invoke(target, convertedValue);
@@ -677,11 +677,13 @@ public final class IntrospectionSupport {
         // allow build pattern as a setter as well
         return setProperty(null, typeConverter, target, name, value, null, true);
     }
-    
+
+    @Deprecated
     public static boolean setProperty(Object target, String name, Object value, boolean allowBuilderPattern) throws Exception {
         return setProperty(null, null, target, name, value, null, allowBuilderPattern);
     }
 
+    @Deprecated
     public static boolean setProperty(Object target, String name, Object value) throws Exception {
         // allow build pattern as a setter as well
         return setProperty(target, name, value, true);
diff --git a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
index caca560..80b521b 100644
--- a/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
+++ b/core/camel-support/src/main/java/org/apache/camel/support/jndi/JndiContext.java
@@ -96,7 +96,7 @@ public class JndiContext implements Context, Serializable {
      * properties set on the injected bean
      */
     public static Map<String, Object> createBindingsMapFromEnvironment(Hashtable<String, Object> env) throws Exception {
-        return new HashMap<>();
+        return new HashMap<>(env);
     }
 
     public void freeze() {

Reply | Threaded
Open this post in threaded view
|

[camel] 04/06: CAMEL-13557: Regen

davsclaus-2
In reply to this post by davsclaus-2
This is an automated email from the ASF dual-hosted git repository.

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

commit ff36d1563887d1ca1399bf2336aee64732b91688
Author: Claus Ibsen <[hidden email]>
AuthorDate: Fri May 24 11:35:18 2019 +0200

    CAMEL-13557: Regen
---
 .../src/main/docs/activemq-component.adoc             |  9 ++++++---
 .../camel-ahc-ws/src/main/docs/ahc-ws-component.adoc  |  9 ++++++---
 components/camel-ahc/src/main/docs/ahc-component.adoc |  9 ++++++---
 .../camel-amqp/src/main/docs/amqp-component.adoc      |  9 ++++++---
 .../camel-apns/src/main/docs/apns-component.adoc      |  9 ++++++---
 .../src/main/docs/as2-component.adoc                  |  9 ++++++---
 .../src/main/docs/asterisk-component.adoc             | 17 ++++++++++++++---
 .../camel-atmos/src/main/docs/atmos-component.adoc    |  9 ++++++---
 .../src/main/docs/atmosphere-websocket-component.adoc |  9 ++++++---
 .../camel-atom/src/main/docs/atom-component.adoc      | 17 ++++++++++++++---
 .../src/main/docs/atomix-map-component.adoc           |  9 ++++++---
 .../src/main/docs/atomix-messaging-component.adoc     |  9 ++++++---
 .../src/main/docs/atomix-multimap-component.adoc      |  9 ++++++---
 .../src/main/docs/atomix-queue-component.adoc         |  9 ++++++---
 .../src/main/docs/atomix-set-component.adoc           |  9 ++++++---
 .../src/main/docs/atomix-value-component.adoc         |  9 ++++++---
 .../camel-avro/src/main/docs/avro-component.adoc      |  9 ++++++---
 .../camel-avro/src/main/docs/avro-dataformat.adoc     |  3 ++-
 .../camel-aws-cw/src/main/docs/aws-cw-component.adoc  |  9 ++++++---
 .../src/main/docs/aws-ddb-component.adoc              |  9 ++++++---
 .../src/main/docs/aws-ddbstream-component.adoc        |  9 ++++++---
 .../src/main/docs/aws-ec2-component.adoc              |  9 ++++++---
 .../src/main/docs/aws-ecs-component.adoc              |  9 ++++++---
 .../src/main/docs/aws-eks-component.adoc              |  9 ++++++---
 .../src/main/docs/aws-iam-component.adoc              |  9 ++++++---
 .../src/main/docs/aws-kinesis-component.adoc          |  9 ++++++---
 .../src/main/docs/aws-kinesis-firehose-component.adoc |  9 ++++++---
 .../src/main/docs/aws-kms-component.adoc              |  9 ++++++---
 .../src/main/docs/aws-lambda-component.adoc           |  9 ++++++---
 .../camel-aws-mq/src/main/docs/aws-mq-component.adoc  |  9 ++++++---
 .../src/main/docs/aws-msk-component.adoc              |  9 ++++++---
 .../camel-aws-s3/src/main/docs/aws-s3-component.adoc  |  9 ++++++---
 .../src/main/docs/aws-sdb-component.adoc              | 17 ++++++++++++++---
 .../src/main/docs/aws-ses-component.adoc              |  9 ++++++---
 .../src/main/docs/aws-sns-component.adoc              |  9 ++++++---
 .../src/main/docs/aws-sqs-component.adoc              |  9 ++++++---
 .../src/main/docs/aws-swf-component.adoc              |  9 ++++++---
 .../src/main/docs/azure-blob-component.adoc           |  9 ++++++---
 .../src/main/docs/azure-queue-component.adoc          |  9 ++++++---
 .../src/main/docs/bean-validator-component.adoc       | 17 ++++++++++++++---
 .../camel-bean/src/main/docs/bean-component.adoc      |  6 ++++--
 .../camel-bean/src/main/docs/class-component.adoc     |  6 ++++--
 .../src/main/docs/beanstalk-component.adoc            |  9 ++++++---
 .../camel-bonita/src/main/docs/bonita-component.adoc  | 17 ++++++++++++++---
 .../src/main/docs/box-component.adoc                  |  9 ++++++---
 .../src/main/docs/braintree-component.adoc            |  9 ++++++---
 .../camel-browse/src/main/docs/browse-component.adoc  | 17 ++++++++++++++---
 .../src/main/docs/caffeine-cache-component.adoc       |  9 ++++++---
 .../src/main/docs/caffeine-loadcache-component.adoc   |  9 ++++++---
 .../src/main/docs/cql-component.adoc                  | 17 ++++++++++++++---
 .../src/main/docs/chatscript-component.adoc           | 17 ++++++++++++++---
 .../camel-chunk/src/main/docs/chunk-component.adoc    | 17 ++++++++++++++---
 .../camel-cm-sms/src/main/docs/cm-sms-component.adoc  | 17 ++++++++++++++---
 .../camel-cmis/src/main/docs/cmis-component.adoc      |  9 ++++++---
 .../camel-coap/src/main/docs/coap-component.adoc      | 17 ++++++++++++++---
 .../camel-cometd/src/main/docs/cometd-component.adoc  |  9 ++++++---
 .../camel-consul/src/main/docs/consul-component.adoc  |  9 ++++++---
 .../src/main/docs/controlbus-component.adoc           | 17 ++++++++++++++---
 .../camel-corda/src/main/docs/corda-component.adoc    |  9 ++++++---
 .../src/main/docs/couchbase-component.adoc            | 17 ++++++++++++++---
 .../src/main/docs/couchdb-component.adoc              | 17 ++++++++++++++---
 .../src/main/docs/crypto-cms-component.adoc           |  9 ++++++---
 .../camel-crypto/src/main/docs/crypto-component.adoc  |  9 ++++++---
 .../camel-crypto/src/main/docs/crypto-dataformat.adoc |  3 ++-
 components/camel-cxf/src/main/docs/cxf-component.adoc |  9 ++++++---
 .../camel-cxf/src/main/docs/cxfrs-component.adoc      |  9 ++++++---
 .../src/main/docs/dataformat-component.adoc           | 17 ++++++++++++++---
 .../src/main/docs/dataset-component.adoc              | 17 ++++++++++++++---
 .../src/main/docs/dataset-test-component.adoc         | 19 +++++++++++++++----
 .../src/main/docs/digitalocean-component.adoc         | 17 ++++++++++++++---
 .../camel-direct/src/main/docs/direct-component.adoc  |  9 ++++++---
 .../src/main/docs/direct-vm-component.adoc            |  6 ++++--
 .../src/main/docs/disruptor-component.adoc            | 10 +++++++---
 components/camel-dns/src/main/docs/dns-component.adoc | 17 ++++++++++++++---
 .../camel-docker/src/main/docs/docker-component.adoc  |  9 ++++++---
 .../camel-dozer/src/main/docs/dozer-component.adoc    | 17 ++++++++++++++---
 .../camel-drill/src/main/docs/drill-component.adoc    | 17 ++++++++++++++---
 .../src/main/docs/dropbox-component.adoc              | 17 ++++++++++++++---
 .../src/main/docs/ehcache-component.adoc              |  9 ++++++---
 components/camel-ejb/src/main/docs/ejb-component.adoc |  6 ++++--
 .../src/main/docs/elasticsearch-rest-component.adoc   |  9 ++++++---
 .../camel-elsql/src/main/docs/elsql-component.adoc    |  9 ++++++---
 .../camel-etcd/src/main/docs/etcd-component.adoc      |  9 ++++++---
 .../src/main/docs/eventadmin-component.adoc           |  6 ++++--
 .../camel-exec/src/main/docs/exec-component.adoc      | 17 ++++++++++++++---
 .../src/main/docs/facebook-component.adoc             |  9 ++++++---
 .../src/main/docs/fhir-component.adoc                 |  9 ++++++---
 .../camel-file/src/main/docs/file-component.adoc      | 17 ++++++++++++++---
 .../src/main/docs/flatpack-component.adoc             | 17 ++++++++++++++---
 .../src/main/docs/flatpack-dataformat.adoc            |  3 ++-
 .../camel-flink/src/main/docs/flink-component.adoc    |  9 ++++++---
 components/camel-fop/src/main/docs/fop-component.adoc | 17 ++++++++++++++---
 .../src/main/docs/freemarker-component.adoc           |  9 ++++++---
 components/camel-ftp/src/main/docs/ftp-component.adoc | 17 ++++++++++++++---
 .../camel-ftp/src/main/docs/ftps-component.adoc       |  9 ++++++---
 .../camel-ftp/src/main/docs/sftp-component.adoc       | 14 ++++++++++++--
 .../src/main/docs/ganglia-component.adoc              |  9 ++++++---
 .../src/main/docs/geocoder-component.adoc             | 17 ++++++++++++++---
 components/camel-git/src/main/docs/git-component.adoc | 17 ++++++++++++++---
 .../camel-github/src/main/docs/github-component.adoc  | 17 ++++++++++++++---
 .../src/main/docs/google-bigquery-component.adoc      |  9 ++++++---
 .../src/main/docs/google-bigquery-sql-component.adoc  |  9 ++++++---
 .../src/main/docs/google-calendar-component.adoc      |  9 ++++++---
 .../main/docs/google-calendar-stream-component.adoc   |  9 ++++++---
 .../src/main/docs/google-drive-component.adoc         |  9 ++++++---
 .../src/main/docs/google-mail-component.adoc          |  9 ++++++---
 .../src/main/docs/google-mail-stream-component.adoc   |  9 ++++++---
 .../src/main/docs/google-pubsub-component.adoc        |  9 ++++++---
 .../src/main/docs/google-sheets-component.adoc        |  9 ++++++---
 .../src/main/docs/google-sheets-stream-component.adoc |  9 ++++++---
 .../camel-gora/src/main/docs/gora-component.adoc      | 17 ++++++++++++++---
 .../camel-grape/src/main/docs/grape-component.adoc    |  6 ++++--
 .../camel-grpc/src/main/docs/grpc-component.adoc      | 17 ++++++++++++++---
 .../src/main/docs/guava-eventbus-component.adoc       |  9 ++++++---
 .../main/docs/hazelcast-atomicvalue-component.adoc    |  9 ++++++---
 .../src/main/docs/hazelcast-instance-component.adoc   |  9 ++++++---
 .../src/main/docs/hazelcast-list-component.adoc       |  9 ++++++---
 .../src/main/docs/hazelcast-map-component.adoc        |  9 ++++++---
 .../src/main/docs/hazelcast-multimap-component.adoc   |  9 ++++++---
 .../src/main/docs/hazelcast-queue-component.adoc      |  9 ++++++---
 .../main/docs/hazelcast-replicatedmap-component.adoc  |  9 ++++++---
 .../src/main/docs/hazelcast-ringbuffer-component.adoc |  9 ++++++---
 .../src/main/docs/hazelcast-seda-component.adoc       |  9 ++++++---
 .../src/main/docs/hazelcast-set-component.adoc        |  9 ++++++---
 .../src/main/docs/hazelcast-topic-component.adoc      |  9 ++++++---
 .../camel-hbase/src/main/docs/hbase-component.adoc    |  9 ++++++---
 .../camel-hdfs2/src/main/docs/hdfs2-component.adoc    |  9 ++++++---
 .../src/main/docs/hipchat-component.adoc              | 17 ++++++++++++++---
 .../camel-http4/src/main/docs/http4-component.adoc    |  9 ++++++---
 .../src/main/docs/iec60870-client-component.adoc      |  9 ++++++---
 .../src/main/docs/iec60870-server-component.adoc      |  9 ++++++---
 .../src/main/docs/ignite-cache-component.adoc         |  9 ++++++---
 .../src/main/docs/ignite-compute-component.adoc       |  9 ++++++---
 .../src/main/docs/ignite-events-component.adoc        |  9 ++++++---
 .../src/main/docs/ignite-idgen-component.adoc         |  9 ++++++---
 .../src/main/docs/ignite-messaging-component.adoc     |  9 ++++++---
 .../src/main/docs/ignite-queue-component.adoc         |  9 ++++++---
 .../src/main/docs/ignite-set-component.adoc           |  9 ++++++---
 .../src/main/docs/infinispan-component.adoc           |  9 ++++++---
 .../src/main/docs/influxdb-component.adoc             | 17 ++++++++++++++---
 .../camel-iota/src/main/docs/iota-component.adoc      | 17 ++++++++++++++---
 .../camel-ipfs/src/main/docs/ipfs-component.adoc      | 17 ++++++++++++++---
 components/camel-irc/src/main/docs/irc-component.adoc |  9 ++++++---
 .../camel-ironmq/src/main/docs/ironmq-component.adoc  | 17 ++++++++++++++---
 .../camel-jbpm/src/main/docs/jbpm-component.adoc      | 17 ++++++++++++++---
 .../camel-jcache/src/main/docs/jcache-component.adoc  |  9 ++++++---
 .../src/main/docs/jclouds-component.adoc              |  9 ++++++---
 components/camel-jcr/src/main/docs/jcr-component.adoc | 17 ++++++++++++++---
 .../camel-jdbc/src/main/docs/jdbc-component.adoc      |  9 ++++++---
 .../camel-jetty/src/main/docs/jetty-component.adoc    |  9 ++++++---
 .../src/main/docs/jgroups-raft-component.adoc         |  9 ++++++---
 .../src/main/docs/jgroups-component.adoc              |  9 ++++++---
 .../camel-jing/src/main/docs/jing-component.adoc      | 17 ++++++++++++++---
 .../camel-jira/src/main/docs/jira-component.adoc      |  9 ++++++---
 components/camel-jms/src/main/docs/jms-component.adoc |  9 ++++++---
 components/camel-jmx/src/main/docs/jmx-component.adoc | 17 ++++++++++++++---
 .../camel-jolt/src/main/docs/jolt-component.adoc      |  9 ++++++---
 .../camel-jooq/src/main/docs/jooq-component.adoc      |  9 ++++++---
 components/camel-jpa/src/main/docs/jpa-component.adoc |  9 ++++++---
 .../camel-jsch/src/main/docs/scp-component.adoc       |  9 ++++++---
 .../src/main/docs/json-validator-component.adoc       | 17 ++++++++++++++---
 .../camel-jt400/src/main/docs/jt400-component.adoc    |  9 ++++++---
 .../camel-kafka/src/main/docs/kafka-component.adoc    |  9 ++++++---
 .../main/docs/kubernetes-config-maps-component.adoc   | 17 ++++++++++++++---
 .../main/docs/kubernetes-deployments-component.adoc   | 17 ++++++++++++++---
 .../src/main/docs/kubernetes-hpa-component.adoc       | 17 ++++++++++++++---
 .../src/main/docs/kubernetes-job-component.adoc       | 17 ++++++++++++++---
 .../main/docs/kubernetes-namespaces-component.adoc    | 17 ++++++++++++++---
 .../src/main/docs/kubernetes-nodes-component.adoc     | 17 ++++++++++++++---
 ...ubernetes-persistent-volumes-claims-component.adoc | 17 ++++++++++++++---
 .../docs/kubernetes-persistent-volumes-component.adoc | 17 ++++++++++++++---
 .../src/main/docs/kubernetes-pods-component.adoc      | 17 ++++++++++++++---
 .../kubernetes-replication-controllers-component.adoc | 17 ++++++++++++++---
 .../docs/kubernetes-resources-quota-component.adoc    | 17 ++++++++++++++---
 .../src/main/docs/kubernetes-secrets-component.adoc   | 17 ++++++++++++++---
 .../docs/kubernetes-service-accounts-component.adoc   | 17 ++++++++++++++---
 .../src/main/docs/kubernetes-services-component.adoc  | 17 ++++++++++++++---
 .../main/docs/openshift-build-configs-component.adoc  | 14 ++++++++++++--
 .../src/main/docs/openshift-builds-component.adoc     | 14 ++++++++++++--
 .../src/main/docs/language-component.adoc             | 17 ++++++++++++++---
 .../camel-ldap/src/main/docs/ldap-component.adoc      | 17 ++++++++++++++---
 .../camel-ldif/src/main/docs/ldif-component.adoc      | 17 ++++++++++++++---
 .../src/main/docs/linkedin-component.adoc             |  9 ++++++---
 components/camel-log/src/main/docs/log-component.adoc |  9 ++++++---
 .../camel-lucene/src/main/docs/lucene-component.adoc  |  9 ++++++---
 .../src/main/docs/lumberjack-component.adoc           |  9 ++++++---
 .../camel-mail/src/main/docs/mail-component.adoc      |  9 ++++++---
 .../camel-master/src/main/docs/master-component.adoc  |  9 ++++++---
 .../src/main/docs/metrics-component.adoc              |  9 ++++++---
 .../src/main/docs/micrometer-component.adoc           |  9 ++++++---
 .../src/main/docs/milo-client-component.adoc          |  9 ++++++---
 .../src/main/docs/milo-server-component.adoc          |  9 ++++++---
 .../camel-mina2/src/main/docs/mina2-component.adoc    |  9 ++++++---
 .../camel-mllp/src/main/docs/mllp-component.adoc      |  9 ++++++---
 .../camel-mock/src/main/docs/mock-component.adoc      | 14 ++++++++++++--
 .../src/main/docs/mongodb-gridfs-component.adoc       | 17 ++++++++++++++---
 .../src/main/docs/mongodb3-component.adoc             | 17 ++++++++++++++---
 .../camel-mqtt/src/main/docs/mqtt-component.adoc      |  9 ++++++---
 components/camel-msv/src/main/docs/msv-component.adoc |  9 ++++++---
 .../src/main/docs/mustache-component.adoc             |  9 ++++++---
 .../camel-mvel/src/main/docs/mvel-component.adoc      | 17 ++++++++++++++---
 .../camel-mvel/src/main/docs/mvel-language.adoc       |  3 ++-
 .../src/main/docs/mybatis-bean-component.adoc         |  9 ++++++---
 .../src/main/docs/mybatis-component.adoc              |  9 ++++++---
 .../camel-nagios/src/main/docs/nagios-component.adoc  |  9 ++++++---
 .../camel-nats/src/main/docs/nats-component.adoc      |  9 ++++++---
 .../src/main/docs/netty4-http-component.adoc          |  9 ++++++---
 .../camel-netty4/src/main/docs/netty4-component.adoc  |  9 ++++++---
 components/camel-nsq/src/main/docs/nsq-component.adoc |  9 ++++++---
 .../src/main/docs/olingo2-component.adoc              |  9 ++++++---
 .../src/main/docs/olingo4-component.adoc              |  9 ++++++---
 .../src/main/docs/openstack-cinder-component.adoc     | 17 ++++++++++++++---
 .../src/main/docs/openstack-glance-component.adoc     | 17 ++++++++++++++---
 .../src/main/docs/openstack-keystone-component.adoc   | 17 ++++++++++++++---
 .../src/main/docs/openstack-neutron-component.adoc    | 17 ++++++++++++++---
 .../src/main/docs/openstack-nova-component.adoc       | 17 ++++++++++++++---
 .../src/main/docs/openstack-swift-component.adoc      | 17 ++++++++++++++---
 .../src/main/docs/optaplanner-component.adoc          | 17 ++++++++++++++---
 .../camel-paho/src/main/docs/paho-component.adoc      |  9 ++++++---
 .../src/main/docs/paxlogging-component.adoc           |  6 ++++--
 components/camel-pdf/src/main/docs/pdf-component.adoc | 17 ++++++++++++++---
 .../src/main/docs/pgevent-component.adoc              | 17 ++++++++++++++---
 .../camel-printer/src/main/docs/lpr-component.adoc    | 17 ++++++++++++++---
 .../src/main/docs/properties-component.adoc           |  9 ++++++---
 .../camel-pubnub/src/main/docs/pubnub-component.adoc  | 17 ++++++++++++++---
 .../camel-pulsar/src/main/docs/pulsar-component.adoc  | 11 +++++++----
 .../src/main/docs/quartz2-component.adoc              |  9 ++++++---
 .../src/main/docs/quickfix-component.adoc             |  9 ++++++---
 .../src/main/docs/rabbitmq-component.adoc             |  9 ++++++---
 .../src/main/docs/reactive-streams-component.adoc     |  9 ++++++---
 components/camel-ref/src/main/docs/ref-component.adoc | 17 ++++++++++++++---
 .../src/main/docs/rest-swagger-component.adoc         |  9 ++++++---
 .../camel-rest/src/main/docs/rest-api-component.adoc  | 17 ++++++++++++++---
 .../camel-rest/src/main/docs/rest-component.adoc      |  9 ++++++---
 .../src/main/docs/restlet-component.adoc              |  9 ++++++---
 components/camel-rss/src/main/docs/rss-component.adoc | 17 ++++++++++++++---
 .../camel-rss/src/main/docs/rss-dataformat.adoc       |  3 ++-
 .../camel-saga/src/main/docs/saga-component.adoc      | 17 ++++++++++++++---
 .../src/main/docs/salesforce-component.adoc           |  9 ++++++---
 .../src/main/docs/sap-netweaver-component.adoc        | 17 ++++++++++++++---
 .../camel-saxon/src/main/docs/xquery-component.adoc   |  9 ++++++---
 .../camel-saxon/src/main/docs/xquery-language.adoc    |  3 ++-
 .../src/main/docs/scheduler-component.adoc            |  9 ++++++---
 .../src/main/docs/schematron-component.adoc           | 17 ++++++++++++++---
 .../camel-seda/src/main/docs/seda-component.adoc      |  9 ++++++---
 .../src/main/docs/service-component.adoc              |  9 ++++++---
 .../src/main/docs/servicenow-component.adoc           |  9 ++++++---
 .../src/main/docs/servlet-component.adoc              |  9 ++++++---
 components/camel-sip/src/main/docs/sip-component.adoc | 17 ++++++++++++++---
 .../src/main/docs/sjms-batch-component.adoc           |  9 ++++++---
 .../camel-sjms/src/main/docs/sjms-component.adoc      |  9 ++++++---
 .../camel-sjms2/src/main/docs/sjms2-component.adoc    |  9 ++++++---
 .../camel-slack/src/main/docs/slack-component.adoc    |  9 ++++++---
 .../camel-smpp/src/main/docs/smpp-component.adoc      |  9 ++++++---
 .../camel-snmp/src/main/docs/snmp-component.adoc      | 17 ++++++++++++++---
 .../camel-solr/src/main/docs/solr-component.adoc      | 17 ++++++++++++++---
 .../src/main/docs/soroush-component.adoc              |  9 ++++++---
 .../src/main/docs/spark-rest-component.adoc           |  6 ++++--
 .../camel-spark/src/main/docs/spark-component.adoc    |  9 ++++++---
 .../camel-splunk/src/main/docs/splunk-component.adoc  |  9 ++++++---
 .../src/main/docs/spring-batch-component.adoc         |  9 ++++++---
 .../src/main/docs/spring-integration-component.adoc   | 17 ++++++++++++++---
 .../src/main/docs/spring-ldap-component.adoc          | 17 ++++++++++++++---
 .../src/main/docs/spring-redis-component.adoc         | 17 ++++++++++++++---
 .../src/main/docs/spring-ws-component.adoc            |  9 ++++++---
 .../src/main/docs/spring-event-component.adoc         | 17 ++++++++++++++---
 components/camel-sql/src/main/docs/sql-component.adoc |  9 ++++++---
 .../camel-sql/src/main/docs/sql-stored-component.adoc |  9 ++++++---
 components/camel-ssh/src/main/docs/ssh-component.adoc |  9 ++++++---
 .../camel-stax/src/main/docs/stax-component.adoc      | 17 ++++++++++++++---
 .../camel-stomp/src/main/docs/stomp-component.adoc    |  9 ++++++---
 .../camel-stream/src/main/docs/stream-component.adoc  | 17 ++++++++++++++---
 .../src/main/docs/string-template-component.adoc      | 17 ++++++++++++++---
 .../camel-stub/src/main/docs/stub-component.adoc      |  9 ++++++---
 .../src/main/docs/telegram-component.adoc             |  9 ++++++---
 .../camel-thrift/src/main/docs/thrift-component.adoc  |  9 ++++++---
 .../camel-thrift/src/main/docs/thrift-dataformat.adoc |  3 ++-
 .../camel-tika/src/main/docs/tika-component.adoc      | 17 ++++++++++++++---
 .../camel-timer/src/main/docs/timer-component.adoc    | 17 ++++++++++++++---
 .../camel-twilio/src/main/docs/twilio-component.adoc  |  9 ++++++---
 .../main/docs/twitter-directmessage-component.adoc    |  9 ++++++---
 .../src/main/docs/twitter-search-component.adoc       |  9 ++++++---
 .../src/main/docs/twitter-streaming-component.adoc    |  9 ++++++---
 .../src/main/docs/twitter-timeline-component.adoc     |  9 ++++++---
 .../src/main/docs/undertow-component.adoc             |  9 ++++++---
 .../src/main/docs/validator-component.adoc            |  9 ++++++---
 .../src/main/docs/velocity-component.adoc             |  9 ++++++---
 .../camel-vertx/src/main/docs/vertx-component.adoc    |  9 ++++++---
 components/camel-vm/src/main/docs/vm-component.adoc   |  9 ++++++---
 .../src/main/docs/weather-component.adoc              |  9 ++++++---
 .../camel-web3j/src/main/docs/web3j-component.adoc    |  9 ++++++---
 .../src/main/docs/webhook-component.adoc              |  9 ++++++---
 .../src/main/docs/websocket-jsr356-component.adoc     | 17 ++++++++++++++---
 .../src/main/docs/websocket-component.adoc            |  9 ++++++---
 .../src/main/docs/wordpress-component.adoc            |  9 ++++++---
 .../src/main/docs/xchange-component.adoc              | 17 ++++++++++++++---
 .../src/main/docs/xmlsecurity-component.adoc          |  9 ++++++---
 .../camel-xmpp/src/main/docs/xmpp-component.adoc      | 17 ++++++++++++++---
 .../camel-xslt/src/main/docs/xslt-component.adoc      |  9 ++++++---
 .../camel-yammer/src/main/docs/yammer-component.adoc  |  9 ++++++---
 .../src/main/docs/zendesk-component.adoc              |  9 ++++++---
 .../src/main/docs/zookeeper-master-component.adoc     |  9 ++++++---
 .../src/main/docs/zookeeper-component.adoc            |  9 ++++++---
 .../org/apache/camel/support/DefaultEndpoint.java     |  2 +-
 .../springboot/ActiveMQComponentConfiguration.java    | 13 +++++++++++++
 .../ahc/springboot/AhcComponentConfiguration.java     | 13 +++++++++++++
 .../ahc/ws/springboot/WsComponentConfiguration.java   | 13 +++++++++++++
 .../amqp/springboot/AMQPComponentConfiguration.java   | 13 +++++++++++++
 .../apns/springboot/ApnsComponentConfiguration.java   | 13 +++++++++++++
 .../as2/springboot/AS2ComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/AsteriskComponentConfiguration.java    | 13 +++++++++++++
 .../atmos/springboot/AtmosComponentConfiguration.java | 13 +++++++++++++
 .../springboot/WebsocketComponentConfiguration.java   | 13 +++++++++++++
 .../atom/springboot/AtomComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/AtomixMapComponentConfiguration.java   | 13 +++++++++++++
 .../AtomixMessagingComponentConfiguration.java        | 13 +++++++++++++
 .../AtomixMultiMapComponentConfiguration.java         | 13 +++++++++++++
 .../springboot/AtomixQueueComponentConfiguration.java | 13 +++++++++++++
 .../springboot/AtomixSetComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/AtomixValueComponentConfiguration.java | 13 +++++++++++++
 .../avro/springboot/AvroComponentConfiguration.java   | 13 +++++++++++++
 .../aws/cw/springboot/CwComponentConfiguration.java   | 13 +++++++++++++
 .../aws/ddb/springboot/DdbComponentConfiguration.java | 13 +++++++++++++
 .../springboot/DdbStreamComponentConfiguration.java   | 13 +++++++++++++
 .../aws/ec2/springboot/EC2ComponentConfiguration.java | 13 +++++++++++++
 .../aws/ecs/springboot/ECSComponentConfiguration.java | 13 +++++++++++++
 .../aws/eks/springboot/EKSComponentConfiguration.java | 13 +++++++++++++
 .../aws/iam/springboot/IAMComponentConfiguration.java | 13 +++++++++++++
 .../KinesisFirehoseComponentConfiguration.java        | 13 +++++++++++++
 .../springboot/KinesisComponentConfiguration.java     | 13 +++++++++++++
 .../aws/kms/springboot/KMSComponentConfiguration.java | 13 +++++++++++++
 .../springboot/LambdaComponentConfiguration.java      | 13 +++++++++++++
 .../aws/mq/springboot/MQComponentConfiguration.java   | 13 +++++++++++++
 .../aws/msk/springboot/MSKComponentConfiguration.java | 13 +++++++++++++
 .../aws/s3/springboot/S3ComponentConfiguration.java   | 13 +++++++++++++
 .../aws/sdb/springboot/SdbComponentConfiguration.java | 13 +++++++++++++
 .../aws/ses/springboot/SesComponentConfiguration.java | 13 +++++++++++++
 .../aws/sns/springboot/SnsComponentConfiguration.java | 13 +++++++++++++
 .../aws/sqs/springboot/SqsComponentConfiguration.java | 13 +++++++++++++
 .../aws/swf/springboot/SWFComponentConfiguration.java | 13 +++++++++++++
 .../springboot/BlobServiceComponentConfiguration.java | 13 +++++++++++++
 .../QueueServiceComponentConfiguration.java           | 13 +++++++++++++
 .../bean/springboot/BeanComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/ClassComponentConfiguration.java       | 13 +++++++++++++
 .../BeanValidatorComponentConfiguration.java          | 13 +++++++++++++
 .../springboot/BeanstalkComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/BonitaComponentConfiguration.java      | 13 +++++++++++++
 .../box/springboot/BoxComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/BraintreeComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/BrowseComponentConfiguration.java      | 13 +++++++++++++
 .../CaffeineCacheComponentConfiguration.java          | 13 +++++++++++++
 .../CaffeineLoadCacheComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/CassandraComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/ChatScriptComponentConfiguration.java  | 13 +++++++++++++
 .../chunk/springboot/ChunkComponentConfiguration.java | 13 +++++++++++++
 .../cm/springboot/CMComponentConfiguration.java       | 13 +++++++++++++
 .../cmis/springboot/CMISComponentConfiguration.java   | 13 +++++++++++++
 .../coap/springboot/CoAPComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/CometdComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/ConsulComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/ControlBusComponentConfiguration.java  | 13 +++++++++++++
 .../corda/springboot/CordaComponentConfiguration.java | 13 +++++++++++++
 .../springboot/CouchbaseComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/CouchDbComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/CryptoCmsComponentConfiguration.java   | 13 +++++++++++++
 .../DigitalSignatureComponentConfiguration.java       | 13 +++++++++++++
 .../jaxrs/springboot/CxfRsComponentConfiguration.java | 13 +++++++++++++
 .../cxf/springboot/CxfComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/DataFormatComponentConfiguration.java  | 13 +++++++++++++
 .../springboot/DataSetComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/DataSetTestComponentConfiguration.java | 13 +++++++++++++
 .../DigitalOceanComponentConfiguration.java           | 13 +++++++++++++
 .../springboot/DirectComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/DirectVmComponentConfiguration.java    | 13 +++++++++++++
 .../springboot/DisruptorComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/DisruptorVmComponentConfiguration.java | 13 +++++++++++++
 .../dns/springboot/DnsComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/DockerComponentConfiguration.java      | 13 +++++++++++++
 .../dozer/springboot/DozerComponentConfiguration.java | 13 +++++++++++++
 .../drill/springboot/DrillComponentConfiguration.java | 13 +++++++++++++
 .../springboot/DropboxComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/EhcacheComponentConfiguration.java     | 13 +++++++++++++
 .../ElasticsearchComponentConfiguration.java          | 13 +++++++++++++
 .../elsql/springboot/ElsqlComponentConfiguration.java | 13 +++++++++++++
 .../etcd/springboot/EtcdComponentConfiguration.java   | 13 +++++++++++++
 .../exec/springboot/ExecComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/FacebookComponentConfiguration.java    | 13 +++++++++++++
 .../fhir/springboot/FhirComponentConfiguration.java   | 13 +++++++++++++
 .../file/springboot/FileComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/FlatpackComponentConfiguration.java    | 13 +++++++++++++
 .../flink/springboot/FlinkComponentConfiguration.java | 13 +++++++++++++
 .../fop/springboot/FopComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/FreemarkerComponentConfiguration.java  | 13 +++++++++++++
 .../remote/springboot/FtpComponentConfiguration.java  | 13 +++++++++++++
 .../remote/springboot/FtpsComponentConfiguration.java | 13 +++++++++++++
 .../remote/springboot/SftpComponentConfiguration.java | 13 +++++++++++++
 .../springboot/GangliaComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/GeoCoderComponentConfiguration.java    | 13 +++++++++++++
 .../git/springboot/GitComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/GitHubComponentConfiguration.java      | 13 +++++++++++++
 .../GoogleBigQueryComponentConfiguration.java         | 13 +++++++++++++
 .../GoogleBigQuerySQLComponentConfiguration.java      | 13 +++++++++++++
 .../GoogleCalendarComponentConfiguration.java         | 13 +++++++++++++
 .../GoogleCalendarStreamComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/GoogleDriveComponentConfiguration.java | 13 +++++++++++++
 .../springboot/GoogleMailComponentConfiguration.java  | 13 +++++++++++++
 .../GoogleMailStreamComponentConfiguration.java       | 13 +++++++++++++
 .../GooglePubsubComponentConfiguration.java           | 13 +++++++++++++
 .../GoogleSheetsComponentConfiguration.java           | 13 +++++++++++++
 .../GoogleSheetsStreamComponentConfiguration.java     | 13 +++++++++++++
 .../gora/springboot/GoraComponentConfiguration.java   | 13 +++++++++++++
 .../grpc/springboot/GrpcComponentConfiguration.java   | 13 +++++++++++++
 .../GuavaEventBusComponentConfiguration.java          | 13 +++++++++++++
 .../HazelcastAtomicnumberComponentConfiguration.java  | 13 +++++++++++++
 .../HazelcastInstanceComponentConfiguration.java      | 13 +++++++++++++
 .../HazelcastListComponentConfiguration.java          | 13 +++++++++++++
 .../HazelcastMapComponentConfiguration.java           | 13 +++++++++++++
 .../HazelcastMultimapComponentConfiguration.java      | 13 +++++++++++++
 .../HazelcastQueueComponentConfiguration.java         | 13 +++++++++++++
 .../HazelcastReplicatedmapComponentConfiguration.java | 13 +++++++++++++
 .../HazelcastRingbufferComponentConfiguration.java    | 13 +++++++++++++
 .../HazelcastSedaComponentConfiguration.java          | 13 +++++++++++++
 .../HazelcastSetComponentConfiguration.java           | 13 +++++++++++++
 .../HazelcastTopicComponentConfiguration.java         | 13 +++++++++++++
 .../hbase/springboot/HBaseComponentConfiguration.java | 13 +++++++++++++
 .../hdfs2/springboot/HdfsComponentConfiguration.java  | 13 +++++++++++++
 .../springboot/HipchatComponentConfiguration.java     | 13 +++++++++++++
 .../http4/springboot/HttpComponentConfiguration.java  | 13 +++++++++++++
 .../springboot/ClientComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/ServerComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/IgniteCacheComponentConfiguration.java | 13 +++++++++++++
 .../IgniteComputeComponentConfiguration.java          | 13 +++++++++++++
 .../IgniteEventsComponentConfiguration.java           | 13 +++++++++++++
 .../springboot/IgniteIdGenComponentConfiguration.java | 13 +++++++++++++
 .../IgniteMessagingComponentConfiguration.java        | 13 +++++++++++++
 .../springboot/IgniteQueueComponentConfiguration.java | 13 +++++++++++++
 .../springboot/IgniteSetComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/InfinispanComponentConfiguration.java  | 13 +++++++++++++
 .../springboot/InfluxDbComponentConfiguration.java    | 13 +++++++++++++
 .../iota/springboot/IOTAComponentConfiguration.java   | 13 +++++++++++++
 .../ipfs/springboot/IPFSComponentConfiguration.java   | 13 +++++++++++++
 .../irc/springboot/IrcComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/IronMQComponentConfiguration.java      | 13 +++++++++++++
 .../jbpm/springboot/JBPMComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/JCacheComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/JcloudsComponentConfiguration.java     | 13 +++++++++++++
 .../jcr/springboot/JcrComponentConfiguration.java     | 13 +++++++++++++
 .../jdbc/springboot/JdbcComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/JettyHttpComponentConfiguration9.java  | 13 +++++++++++++
 .../springboot/JGroupsRaftComponentConfiguration.java | 13 +++++++++++++
 .../springboot/JGroupsComponentConfiguration.java     | 13 +++++++++++++
 .../jing/springboot/JingComponentConfiguration.java   | 13 +++++++++++++
 .../jira/springboot/JiraComponentConfiguration.java   | 13 +++++++++++++
 .../jms/springboot/JmsComponentConfiguration.java     | 13 +++++++++++++
 .../jmx/springboot/JMXComponentConfiguration.java     | 13 +++++++++++++
 .../jolt/springboot/JoltComponentConfiguration.java   | 13 +++++++++++++
 .../jooq/springboot/JooqComponentConfiguration.java   | 13 +++++++++++++
 .../jpa/springboot/JpaComponentConfiguration.java     | 13 +++++++++++++
 .../scp/springboot/ScpComponentConfiguration.java     | 13 +++++++++++++
 .../JsonValidatorComponentConfiguration.java          | 13 +++++++++++++
 .../jt400/springboot/Jt400ComponentConfiguration.java | 13 +++++++++++++
 .../kafka/springboot/KafkaComponentConfiguration.java | 13 +++++++++++++
 .../KubernetesConfigMapsComponentConfiguration.java   | 13 +++++++++++++
 .../KubernetesDeploymentsComponentConfiguration.java  | 13 +++++++++++++
 .../KubernetesHPAComponentConfiguration.java          | 13 +++++++++++++
 .../KubernetesJobComponentConfiguration.java          | 13 +++++++++++++
 .../KubernetesNamespacesComponentConfiguration.java   | 13 +++++++++++++
 .../KubernetesNodesComponentConfiguration.java        | 13 +++++++++++++
 ...rnetesPersistentVolumesComponentConfiguration.java | 13 +++++++++++++
 ...PersistentVolumesClaimsComponentConfiguration.java | 13 +++++++++++++
 .../KubernetesPodsComponentConfiguration.java         | 13 +++++++++++++
 ...sReplicationControllersComponentConfiguration.java | 13 +++++++++++++
 ...ubernetesResourcesQuotaComponentConfiguration.java | 13 +++++++++++++
 .../KubernetesSecretsComponentConfiguration.java      | 13 +++++++++++++
 ...bernetesServiceAccountsComponentConfiguration.java | 13 +++++++++++++
 .../KubernetesServicesComponentConfiguration.java     | 13 +++++++++++++
 .../OpenshiftBuildConfigsComponentConfiguration.java  | 13 +++++++++++++
 .../OpenshiftBuildsComponentConfiguration.java        | 13 +++++++++++++
 .../springboot/LanguageComponentConfiguration.java    | 13 +++++++++++++
 .../ldap/springboot/LdapComponentConfiguration.java   | 13 +++++++++++++
 .../ldif/springboot/LdifComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/LinkedInComponentConfiguration.java    | 13 +++++++++++++
 .../log/springboot/LogComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/LuceneComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/LumberjackComponentConfiguration.java  | 13 +++++++++++++
 .../mail/springboot/MailComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/MasterComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/MetricsComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/MicrometerComponentConfiguration.java  | 13 +++++++++++++
 .../springboot/MiloClientComponentConfiguration.java  | 13 +++++++++++++
 .../springboot/MiloServerComponentConfiguration.java  | 13 +++++++++++++
 .../mina2/springboot/Mina2ComponentConfiguration.java | 13 +++++++++++++
 .../mllp/springboot/MllpComponentConfiguration.java   | 13 +++++++++++++
 .../mock/springboot/MockComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/GridFsComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/MongoDbComponentConfiguration.java     | 13 +++++++++++++
 .../mqtt/springboot/MQTTComponentConfiguration.java   | 13 +++++++++++++
 .../msv/springboot/MsvComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/MustacheComponentConfiguration.java    | 13 +++++++++++++
 .../mvel/springboot/MvelComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/MyBatisBeanComponentConfiguration.java | 13 +++++++++++++
 .../springboot/MyBatisComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/NagiosComponentConfiguration.java      | 13 +++++++++++++
 .../nats/springboot/NatsComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/NettyHttpComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/NettyComponentConfiguration.java       | 13 +++++++++++++
 .../nsq/springboot/NsqComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/Olingo2ComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/Olingo4ComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/CinderComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/GlanceComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/KeystoneComponentConfiguration.java    | 13 +++++++++++++
 .../springboot/NeutronComponentConfiguration.java     | 13 +++++++++++++
 .../nova/springboot/NovaComponentConfiguration.java   | 13 +++++++++++++
 .../swift/springboot/SwiftComponentConfiguration.java | 13 +++++++++++++
 .../springboot/OptaPlannerComponentConfiguration.java | 13 +++++++++++++
 .../paho/springboot/PahoComponentConfiguration.java   | 13 +++++++++++++
 .../pdf/springboot/PdfComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/PgEventComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/PrinterComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/PropertiesComponentConfiguration.java  | 13 +++++++++++++
 .../springboot/PubNubComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/PulsarComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/QuartzComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/QuickfixjComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/RabbitMQComponentConfiguration.java    | 13 +++++++++++++
 .../ReactiveStreamsComponentConfiguration.java        | 13 +++++++++++++
 .../ref/springboot/RefComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/RestApiComponentConfiguration.java     | 13 +++++++++++++
 .../rest/springboot/RestComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/RestSwaggerComponentConfiguration.java | 13 +++++++++++++
 .../springboot/RestletComponentConfiguration.java     | 13 +++++++++++++
 .../rss/springboot/RssComponentConfiguration.java     | 13 +++++++++++++
 .../saga/springboot/SagaComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/SalesforceComponentConfiguration.java  | 13 +++++++++++++
 .../springboot/NetWeaverComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/XQueryComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/SchedulerComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/SchematronComponentConfiguration.java  | 13 +++++++++++++
 .../seda/springboot/SedaComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/ServiceComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/ServiceNowComponentConfiguration.java  | 13 +++++++++++++
 .../springboot/ServletComponentConfiguration.java     | 13 +++++++++++++
 .../sip/springboot/SipComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/SjmsBatchComponentConfiguration.java   | 13 +++++++++++++
 .../sjms/springboot/SjmsComponentConfiguration.java   | 13 +++++++++++++
 .../sjms2/springboot/Sjms2ComponentConfiguration.java | 13 +++++++++++++
 .../slack/springboot/SlackComponentConfiguration.java | 13 +++++++++++++
 .../smpp/springboot/SmppComponentConfiguration.java   | 13 +++++++++++++
 .../snmp/springboot/SnmpComponentConfiguration.java   | 13 +++++++++++++
 .../solr/springboot/SolrComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/SoroushBotComponentConfiguration.java  | 13 +++++++++++++
 .../spark/springboot/SparkComponentConfiguration.java | 13 +++++++++++++
 .../springboot/SplunkComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/SpringBatchComponentConfiguration.java | 13 +++++++++++++
 .../SpringIntegrationComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/SpringLdapComponentConfiguration.java  | 13 +++++++++++++
 .../redis/springboot/RedisComponentConfiguration.java | 13 +++++++++++++
 .../event/springboot/EventComponentConfiguration.java | 13 +++++++++++++
 .../SpringWebserviceComponentConfiguration.java       | 13 +++++++++++++
 .../sql/springboot/SqlComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/SqlStoredComponentConfiguration.java   | 13 +++++++++++++
 .../ssh/springboot/SshComponentConfiguration.java     | 13 +++++++++++++
 .../stax/springboot/StAXComponentConfiguration.java   | 13 +++++++++++++
 .../stomp/springboot/StompComponentConfiguration.java | 13 +++++++++++++
 .../springboot/StreamComponentConfiguration.java      | 13 +++++++++++++
 .../StringTemplateComponentConfiguration.java         | 13 +++++++++++++
 .../stub/springboot/StubComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/TelegramComponentConfiguration.java    | 13 +++++++++++++
 .../springboot/ThriftComponentConfiguration.java      | 13 +++++++++++++
 .../tika/springboot/TikaComponentConfiguration.java   | 13 +++++++++++++
 .../timer/springboot/TimerComponentConfiguration.java | 13 +++++++++++++
 .../springboot/TwilioComponentConfiguration.java      | 13 +++++++++++++
 .../TwitterDirectMessageComponentConfiguration.java   | 13 +++++++++++++
 .../TwitterSearchComponentConfiguration.java          | 13 +++++++++++++
 .../TwitterStreamingComponentConfiguration.java       | 13 +++++++++++++
 .../TwitterTimelineComponentConfiguration.java        | 13 +++++++++++++
 .../springboot/UndertowComponentConfiguration.java    | 13 +++++++++++++
 .../springboot/ValidatorComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/VelocityComponentConfiguration.java    | 13 +++++++++++++
 .../vertx/springboot/VertxComponentConfiguration.java | 13 +++++++++++++
 .../vm/springboot/VmComponentConfiguration.java       | 13 +++++++++++++
 .../springboot/WeatherComponentConfiguration.java     | 13 +++++++++++++
 .../web3j/springboot/Web3jComponentConfiguration.java | 13 +++++++++++++
 .../springboot/WebhookComponentConfiguration.java     | 13 +++++++++++++
 .../JSR356WebSocketComponentConfiguration.java        | 13 +++++++++++++
 .../springboot/WebsocketComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/WordpressComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/XChangeComponentConfiguration.java     | 13 +++++++++++++
 .../XmlSignatureComponentConfiguration.java           | 13 +++++++++++++
 .../xmpp/springboot/XmppComponentConfiguration.java   | 13 +++++++++++++
 .../xslt/springboot/XsltComponentConfiguration.java   | 13 +++++++++++++
 .../springboot/YammerComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/ZendeskComponentConfiguration.java     | 13 +++++++++++++
 .../springboot/MasterComponentConfiguration.java      | 13 +++++++++++++
 .../springboot/ZooKeeperComponentConfiguration.java   | 13 +++++++++++++
 596 files changed, 6350 insertions(+), 886 deletions(-)

diff --git a/components/camel-activemq/src/main/docs/activemq-component.adoc b/components/camel-activemq/src/main/docs/activemq-component.adoc
index 30f82c9..4ced490 100644
--- a/components/camel-activemq/src/main/docs/activemq-component.adoc
+++ b/components/camel-activemq/src/main/docs/activemq-component.adoc
@@ -44,7 +44,7 @@ activemq:foo
 === Component options
 
 // component options: START
-The ActiveMQ component supports 85 options, which are listed below.
+The ActiveMQ component supports 86 options, which are listed below.
 
 
 
@@ -136,6 +136,7 @@ The ActiveMQ component supports 85 options, which are listed below.
 | *formatDateHeadersTo Iso8601* (producer) | Sets whether date headers should be formatted according to the ISO 8601 standard. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -162,7 +163,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (91 parameters):
+==== Query Parameters (92 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -224,6 +225,7 @@ with the following path and query parameters:
 | *allowSerializedHeaders* (advanced) | Controls whether or not to include serialized headers. Applies only when isTransferExchange() is true. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | boolean
 | *asyncStartListener* (advanced) | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, the [...]
 | *asyncStopListener* (advanced) | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *destinationResolver* (advanced) | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). |  | DestinationResolver
 | *errorHandler* (advanced) | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom errorHandler. [...]
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
@@ -278,7 +280,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 86 options, which are listed below.
+The component supports 87 options, which are listed below.
 
 
 
@@ -296,6 +298,7 @@ The component supports 86 options, which are listed below.
 | *camel.component.activemq.async-start-listener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this opt [...]
 | *camel.component.activemq.async-stop-listener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | Boolean
 | *camel.component.activemq.auto-startup* | Specifies whether the consumer container should auto-startup. | true | Boolean
+| *camel.component.activemq.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.activemq.broker-u-r-l* | Sets the broker URL to use to connect to ActiveMQ using the ActiveMQ URI format |  | String
 | *camel.component.activemq.cache-level* | Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details. |  | Integer
 | *camel.component.activemq.cache-level-name* | Sets the cache level by name for the underlying JMS resources. Possible values are: CACHE_AUTO, CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default setting is CACHE_AUTO. See the Spring documentation and Transactions Cache Levels for more information. | CACHE_AUTO | String
diff --git a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
index 3674206..d2a30d1 100644
--- a/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
+++ b/components/camel-ahc-ws/src/main/docs/ahc-ws-component.adoc
@@ -42,7 +42,7 @@ various configuration options of the AHC component.
 
 
 // component options: START
-The AHC Websocket component supports 8 options, which are listed below.
+The AHC Websocket component supports 9 options, which are listed below.
 
 
 
@@ -57,6 +57,7 @@ The AHC Websocket component supports 8 options, which are listed below.
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -82,7 +83,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (15 parameters):
+==== Query Parameters (16 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -97,6 +98,7 @@ with the following path and query parameters:
 | *headerFilterStrategy* (producer) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *throwExceptionOnFailure* (producer) | Option to disable throwing the AhcOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | true | boolean
 | *transferException* (producer) | If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type (for example using Jetty or Servlet Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the AhcOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enab [...]
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *binding* (advanced) | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. |  | AhcBinding
 | *clientConfig* (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. |  | AsyncHttpClientConfig
 | *clientConfigOptions* (advanced) | To configure the AsyncHttpClientConfig using the key/values from the Map. |  | Map
@@ -121,7 +123,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
 
 
 
@@ -129,6 +131,7 @@ The component supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.ahc-ws.allow-java-serialized-object* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | Boolean
+| *camel.component.ahc-ws.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ahc-ws.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. The option is a org.apache.camel.component.ahc.AhcBinding type. |  | String
 | *camel.component.ahc-ws.client* | To use a custom AsyncHttpClient. The option is a org.asynchttpclient.AsyncHttpClient type. |  | String
 | *camel.component.ahc-ws.client-config* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. The option is a org.asynchttpclient.AsyncHttpClientConfig type. |  | String
diff --git a/components/camel-ahc/src/main/docs/ahc-component.adoc b/components/camel-ahc/src/main/docs/ahc-component.adoc
index 8a69a1f..fd0ed79 100644
--- a/components/camel-ahc/src/main/docs/ahc-component.adoc
+++ b/components/camel-ahc/src/main/docs/ahc-component.adoc
@@ -63,7 +63,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +76,7 @@ with the following path and query parameters:
 | *headerFilterStrategy* (producer) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *throwExceptionOnFailure* (producer) | Option to disable throwing the AhcOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | true | boolean
 | *transferException* (producer) | If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type (for example using Jetty or Servlet Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the AhcOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enab [...]
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *binding* (advanced) | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. |  | AhcBinding
 | *clientConfig* (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. |  | AsyncHttpClientConfig
 | *clientConfigOptions* (advanced) | To configure the AsyncHttpClientConfig using the key/values from the Map. |  | Map
@@ -100,7 +101,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
 
 
 
@@ -108,6 +109,7 @@ The component supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.ahc.allow-java-serialized-object* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | Boolean
+| *camel.component.ahc.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ahc.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. The option is a org.apache.camel.component.ahc.AhcBinding type. |  | String
 | *camel.component.ahc.client* | To use a custom AsyncHttpClient. The option is a org.asynchttpclient.AsyncHttpClient type. |  | String
 | *camel.component.ahc.client-config* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. The option is a org.asynchttpclient.AsyncHttpClientConfig type. |  | String
@@ -138,7 +140,7 @@ The component supports 9 options, which are listed below.
 
 
 // component options: START
-The AHC component supports 8 options, which are listed below.
+The AHC component supports 9 options, which are listed below.
 
 
 
@@ -153,6 +155,7 @@ The AHC component supports 8 options, which are listed below.
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
diff --git a/components/camel-amqp/src/main/docs/amqp-component.adoc b/components/camel-amqp/src/main/docs/amqp-component.adoc
index 8932c4b..38b2afb 100644
--- a/components/camel-amqp/src/main/docs/amqp-component.adoc
+++ b/components/camel-amqp/src/main/docs/amqp-component.adoc
@@ -39,7 +39,7 @@ link:../../../../camel-jms/src/main/docs/readme.html[JMS] component after the de
 
 
 // component options: START
-The AMQP component supports 80 options, which are listed below.
+The AMQP component supports 81 options, which are listed below.
 
 
 
@@ -126,6 +126,7 @@ The AMQP component supports 80 options, which are listed below.
 | *formatDateHeadersTo Iso8601* (producer) | Sets whether date headers should be formatted according to the ISO 8601 standard. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -155,7 +156,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (91 parameters):
+==== Query Parameters (92 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -217,6 +218,7 @@ with the following path and query parameters:
 | *allowSerializedHeaders* (advanced) | Controls whether or not to include serialized headers. Applies only when isTransferExchange() is true. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | boolean
 | *asyncStartListener* (advanced) | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, the [...]
 | *asyncStopListener* (advanced) | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *destinationResolver* (advanced) | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). |  | DestinationResolver
 | *errorHandler* (advanced) | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom errorHandler. [...]
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
@@ -270,7 +272,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 81 options, which are listed below.
+The component supports 82 options, which are listed below.
 
 
 
@@ -288,6 +290,7 @@ The component supports 81 options, which are listed below.
 | *camel.component.amqp.async-start-listener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option  [...]
 | *camel.component.amqp.async-stop-listener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | Boolean
 | *camel.component.amqp.auto-startup* | Specifies whether the consumer container should auto-startup. | true | Boolean
+| *camel.component.amqp.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.amqp.cache-level* | Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details. |  | Integer
 | *camel.component.amqp.cache-level-name* | Sets the cache level by name for the underlying JMS resources. Possible values are: CACHE_AUTO, CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default setting is CACHE_AUTO. See the Spring documentation and Transactions Cache Levels for more information. | CACHE_AUTO | String
 | *camel.component.amqp.client-id* | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. |  | String
diff --git a/components/camel-apns/src/main/docs/apns-component.adoc b/components/camel-apns/src/main/docs/apns-component.adoc
index 8955b60..92e97c0 100644
--- a/components/camel-apns/src/main/docs/apns-component.adoc
+++ b/components/camel-apns/src/main/docs/apns-component.adoc
@@ -52,7 +52,7 @@ apns:consumer[?options]
 
 
 // component options: START
-The APNS component supports 2 options, which are listed below.
+The APNS component supports 3 options, which are listed below.
 
 
 
@@ -61,6 +61,7 @@ The APNS component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *apnsService* (common) | *Required* The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService |  | ApnsService
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -86,7 +87,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +99,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -130,7 +132,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
@@ -138,6 +140,7 @@ The component supports 3 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.apns.apns-service* | The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService. The option is a com.notnoop.apns.ApnsService type. |  | String
+| *camel.component.apns.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.apns.enabled* | Enable apns component | true | Boolean
 | *camel.component.apns.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
index 3352516..d91f891 100644
--- a/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
+++ b/components/camel-as2/camel-as2-component/src/main/docs/as2-component.adoc
@@ -38,7 +38,7 @@ apiName can be one of:
 
 
 // component options: START
-The AS2 component supports 2 options, which are listed below.
+The AS2 component supports 3 options, which are listed below.
 
 
 
@@ -47,6 +47,7 @@ The AS2 component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (common) | To use the shared configuration |  | AS2Configuration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -71,7 +72,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (31 parameters):
+==== Query Parameters (32 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -107,6 +108,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -126,13 +128,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 30 options, which are listed below.
+The component supports 31 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.as2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.as2.configuration.api-name* | What kind of operation to perform |  | AS2ApiName
 | *camel.component.as2.configuration.as2-from* | The value of the AS2From header of AS2 message. |  | String
 | *camel.component.as2.configuration.as2-message-structure* | The structure of AS2 Message. One of: PLAIN - No encryption, no signature, SIGNED - No encryption, signature, ENCRYPTED - Encryption, no signature, ENCRYPTED_SIGNED - Encryption, signature |  | AS2MessageStructure
diff --git a/components/camel-asterisk/src/main/docs/asterisk-component.adoc b/components/camel-asterisk/src/main/docs/asterisk-component.adoc
index 7f0be60..e655c3b 100644
--- a/components/camel-asterisk/src/main/docs/asterisk-component.adoc
+++ b/components/camel-asterisk/src/main/docs/asterisk-component.adoc
@@ -30,7 +30,16 @@ asterisk:name[?options]
 ### Options
 
 // component options: START
-The Asterisk component has no options.
+The Asterisk component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -52,7 +61,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -65,6 +74,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *action* (producer) | What action to perform such as getting queue status, sip peers or extension state. |  | AsteriskAction
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -84,13 +94,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.asterisk.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.asterisk.enabled* | Enable asterisk component | true | Boolean
 | *camel.component.asterisk.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-atmos/src/main/docs/atmos-component.adoc b/components/camel-atmos/src/main/docs/atmos-component.adoc
index 6b2ccdd..eb321ca 100644
--- a/components/camel-atmos/src/main/docs/atmos-component.adoc
+++ b/components/camel-atmos/src/main/docs/atmos-component.adoc
@@ -16,7 +16,7 @@ from("atmos:foo/get?remotePath=/path").to("mock:test");
 
 
 // component options: START
-The Atmos component supports 5 options, which are listed below.
+The Atmos component supports 6 options, which are listed below.
 
 
 
@@ -28,6 +28,7 @@ The Atmos component supports 5 options, which are listed below.
 | *uri* (advanced) | The URI of the server for the Atmos client to connect to |  | String
 | *sslValidation* (security) | Whether the Atmos client should perform SSL validation | false | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -53,7 +54,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (12 parameters):
+==== Query Parameters (13 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -70,6 +71,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -89,13 +91,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.atmos.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atmos.enabled* | Enable atmos component | true | Boolean
 | *camel.component.atmos.full-token-id* | The token id to pass to the Atmos client |  | String
 | *camel.component.atmos.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
index ff14a63..fca7bbf 100644
--- a/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
+++ b/components/camel-atmosphere-websocket/src/main/docs/atmosphere-websocket-component.adoc
@@ -35,7 +35,7 @@ their `pom.xml` for this component:
 
 
 // component options: START
-The Atmosphere Websocket component supports 9 options, which are listed below.
+The Atmosphere Websocket component supports 10 options, which are listed below.
 
 
 
@@ -51,6 +51,7 @@ The Atmosphere Websocket component supports 9 options, which are listed below.
 | *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -76,7 +77,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (24 parameters):
+==== Query Parameters (25 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -102,6 +103,7 @@ with the following path and query parameters:
 | *fileNameExtWhitelist* (consumer) | Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml. |  | String
 | *optionsEnabled* (consumer) | Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off. | false | boolean
 | *traceEnabled* (consumer) | Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *mapHttpMessageBody* (advanced) | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping. | true | boolean
 | *mapHttpMessageFormUrl EncodedBody* (advanced) | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping. | true | boolean
 | *mapHttpMessageHeaders* (advanced) | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping. | true | boolean
@@ -124,7 +126,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 10 options, which are listed below.
+The component supports 11 options, which are listed below.
 
 
 
@@ -133,6 +135,7 @@ The component supports 10 options, which are listed below.
 | Name | Description | Default | Type
 | *camel.component.atmosphere-websocket.allow-java-serialized-object* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | Boolean
 | *camel.component.atmosphere-websocket.attachment-multipart-binding* | Whether to automatic bind multipart/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove disableStreamCache to use AttachmentMultipartBinding. This is turn off by default as this may require servlet specific configuration to enable this when using Servlet's. | false | Boolean
+| *camel.component.atmosphere-websocket.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atmosphere-websocket.enabled* | Enable atmosphere-websocket component | true | Boolean
 | *camel.component.atmosphere-websocket.file-name-ext-whitelist* | Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml. |  | String
 | *camel.component.atmosphere-websocket.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. |  | String
diff --git a/components/camel-atom/src/main/docs/atom-component.adoc b/components/camel-atom/src/main/docs/atom-component.adoc
index 21e050f..8eb7b4c 100644
--- a/components/camel-atom/src/main/docs/atom-component.adoc
+++ b/components/camel-atom/src/main/docs/atom-component.adoc
@@ -35,7 +35,16 @@ Where *atomUri* is the URI to the Atom feed to poll.
 
 
 // component options: START
-The Atom component has no options.
+The Atom component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -59,7 +68,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (27 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -78,6 +87,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -110,13 +120,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.atom.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atom.enabled* | Enable atom component | true | Boolean
 | *camel.component.atom.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-atomix/src/main/docs/atomix-map-component.adoc b/components/camel-atomix/src/main/docs/atomix-map-component.adoc
index f06972c..d3d8c34 100644
--- a/components/camel-atomix/src/main/docs/atomix-map-component.adoc
+++ b/components/camel-atomix/src/main/docs/atomix-map-component.adoc
@@ -26,7 +26,7 @@ Maven users will need to add the following dependency to their pom.xml for this
 ### Options
 
 // component options: START
-The Atomix Map component supports 5 options, which are listed below.
+The Atomix Map component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The Atomix Map component supports 5 options, which are listed below.
 | *nodes* (common) | The nodes the AtomixClient should connect to |  | List
 | *configurationUri* (common) | The path to the AtomixClient configuration |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -60,7 +61,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (18 parameters):
+==== Query Parameters (19 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -77,6 +78,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *defaultResourceConfig* (advanced) | The cluster wide default resource configuration. |  | Properties
 | *defaultResourceOptions* (advanced) | The local default resource options. |  | Properties
 | *ephemeral* (advanced) | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | boolean
@@ -102,7 +104,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
 
 
 
@@ -110,6 +112,7 @@ The component supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.atomix-map.atomix* | The shared AtomixClient instance. The option is a io.atomix.AtomixClient type. |  | String
+| *camel.component.atomix-map.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atomix-map.configuration-uri* | The path to the AtomixClient configuration |  | String
 | *camel.component.atomix-map.configuration.default-action* | The default action. |  | AtomixMap$Action
 | *camel.component.atomix-map.configuration.key* | The key to use if none is set in the header or to listen for events for a specific key. |  | Object
diff --git a/components/camel-atomix/src/main/docs/atomix-messaging-component.adoc b/components/camel-atomix/src/main/docs/atomix-messaging-component.adoc
index d2940ef..b4827ff 100644
--- a/components/camel-atomix/src/main/docs/atomix-messaging-component.adoc
+++ b/components/camel-atomix/src/main/docs/atomix-messaging-component.adoc
@@ -25,7 +25,7 @@ for this component:
 ----
 
 // component options: START
-The Atomix Messaging component supports 5 options, which are listed below.
+The Atomix Messaging component supports 6 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The Atomix Messaging component supports 5 options, which are listed below.
 | *nodes* (common) | The nodes the AtomixClient should connect to |  | List
 | *configurationUri* (common) | The path to the AtomixClient configuration |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -59,7 +60,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (19 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -77,6 +78,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *defaultResourceConfig* (advanced) | The cluster wide default resource configuration. |  | Properties
 | *defaultResourceOptions* (advanced) | The local default resource options. |  | Properties
 | *ephemeral* (advanced) | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | boolean
@@ -102,7 +104,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 10 options, which are listed below.
+The component supports 11 options, which are listed below.
 
 
 
@@ -110,6 +112,7 @@ The component supports 10 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.atomix-messaging.atomix* | The shared AtomixClient instance. The option is a io.atomix.AtomixClient type. |  | String
+| *camel.component.atomix-messaging.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atomix-messaging.configuration-uri* | The path to the AtomixClient configuration |  | String
 | *camel.component.atomix-messaging.configuration.broadcast-type* | The broadcast type. |  | AtomixMessaging$ BroadcastType
 | *camel.component.atomix-messaging.configuration.channel-name* | The messaging channel name |  | String
diff --git a/components/camel-atomix/src/main/docs/atomix-multimap-component.adoc b/components/camel-atomix/src/main/docs/atomix-multimap-component.adoc
index 2144c13..02be5da 100644
--- a/components/camel-atomix/src/main/docs/atomix-multimap-component.adoc
+++ b/components/camel-atomix/src/main/docs/atomix-multimap-component.adoc
@@ -25,7 +25,7 @@ for this component:
 ----
 
 // component options: START
-The Atomix MultiMap component supports 5 options, which are listed below.
+The Atomix MultiMap component supports 6 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The Atomix MultiMap component supports 5 options, which are listed below.
 | *nodes* (consumer) | The nodes the AtomixClient should connect to |  | List
 | *configurationUri* (consumer) | The path to the AtomixClient configuration |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -59,7 +60,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (18 parameters):
+==== Query Parameters (19 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *ttl* (consumer) | The resource ttl. |  | long
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *defaultResourceConfig* (advanced) | The cluster wide default resource configuration. |  | Properties
 | *defaultResourceOptions* (advanced) | The local default resource options. |  | Properties
 | *ephemeral* (advanced) | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | boolean
@@ -101,7 +103,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
 
 
 
@@ -109,6 +111,7 @@ The component supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.atomix-multimap.atomix* | The shared AtomixClient instance. The option is a io.atomix.AtomixClient type. |  | String
+| *camel.component.atomix-multimap.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atomix-multimap.configuration-uri* | The path to the AtomixClient configuration |  | String
 | *camel.component.atomix-multimap.configuration.default-action* | The default action. |  | AtomixMultiMap$Action
 | *camel.component.atomix-multimap.configuration.key* | The key to use if none is set in the header or to listen for events for a specific key. |  | Object
diff --git a/components/camel-atomix/src/main/docs/atomix-queue-component.adoc b/components/camel-atomix/src/main/docs/atomix-queue-component.adoc
index 7449d68..1c96a53 100644
--- a/components/camel-atomix/src/main/docs/atomix-queue-component.adoc
+++ b/components/camel-atomix/src/main/docs/atomix-queue-component.adoc
@@ -25,7 +25,7 @@ for this component:
 ----
 
 // component options: START
-The Atomix Queue component supports 5 options, which are listed below.
+The Atomix Queue component supports 6 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The Atomix Queue component supports 5 options, which are listed below.
 | *nodes* (common) | The nodes the AtomixClient should connect to |  | List
 | *configurationUri* (common) | The path to the AtomixClient configuration |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -59,7 +60,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -74,6 +75,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *defaultResourceConfig* (advanced) | The cluster wide default resource configuration. |  | Properties
 | *defaultResourceOptions* (advanced) | The local default resource options. |  | Properties
 | *ephemeral* (advanced) | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | boolean
@@ -99,7 +101,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 7 options, which are listed below.
+The component supports 8 options, which are listed below.
 
 
 
@@ -107,6 +109,7 @@ The component supports 7 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.atomix-queue.atomix* | The shared AtomixClient instance. The option is a io.atomix.AtomixClient type. |  | String
+| *camel.component.atomix-queue.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atomix-queue.configuration-uri* | The path to the AtomixClient configuration |  | String
 | *camel.component.atomix-queue.configuration.default-action* | The default action. |  | AtomixQueue$Action
 | *camel.component.atomix-queue.configuration.result-header* | The header that wil carry the result. |  | String
diff --git a/components/camel-atomix/src/main/docs/atomix-set-component.adoc b/components/camel-atomix/src/main/docs/atomix-set-component.adoc
index bb23b0f..b217646 100644
--- a/components/camel-atomix/src/main/docs/atomix-set-component.adoc
+++ b/components/camel-atomix/src/main/docs/atomix-set-component.adoc
@@ -25,7 +25,7 @@ for this component:
 ----
 
 // component options: START
-The Atomix Set component supports 5 options, which are listed below.
+The Atomix Set component supports 6 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The Atomix Set component supports 5 options, which are listed below.
 | *nodes* (common) | The nodes the AtomixClient should connect to |  | List
 | *configurationUri* (common) | The path to the AtomixClient configuration |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -59,7 +60,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (17 parameters):
+==== Query Parameters (18 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -75,6 +76,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *defaultResourceConfig* (advanced) | The cluster wide default resource configuration. |  | Properties
 | *defaultResourceOptions* (advanced) | The local default resource options. |  | Properties
 | *ephemeral* (advanced) | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | boolean
@@ -100,7 +102,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 8 options, which are listed below.
+The component supports 9 options, which are listed below.
 
 
 
@@ -108,6 +110,7 @@ The component supports 8 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.atomix-set.atomix* | The shared AtomixClient instance. The option is a io.atomix.AtomixClient type. |  | String
+| *camel.component.atomix-set.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atomix-set.configuration-uri* | The path to the AtomixClient configuration |  | String
 | *camel.component.atomix-set.configuration.default-action* | The default action. |  | AtomixSet$Action
 | *camel.component.atomix-set.configuration.result-header* | The header that wil carry the result. |  | String
diff --git a/components/camel-atomix/src/main/docs/atomix-value-component.adoc b/components/camel-atomix/src/main/docs/atomix-value-component.adoc
index d034cf4..587db17 100644
--- a/components/camel-atomix/src/main/docs/atomix-value-component.adoc
+++ b/components/camel-atomix/src/main/docs/atomix-value-component.adoc
@@ -25,7 +25,7 @@ for this component:
 ----
 
 // component options: START
-The Atomix Value component supports 5 options, which are listed below.
+The Atomix Value component supports 6 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The Atomix Value component supports 5 options, which are listed below.
 | *nodes* (common) | The nodes the AtomixClient should connect to |  | List
 | *configurationUri* (common) | The path to the AtomixClient configuration |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -59,7 +60,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (17 parameters):
+==== Query Parameters (18 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -75,6 +76,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *defaultResourceConfig* (advanced) | The cluster wide default resource configuration. |  | Properties
 | *defaultResourceOptions* (advanced) | The local default resource options. |  | Properties
 | *ephemeral* (advanced) | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | boolean
@@ -100,7 +102,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 8 options, which are listed below.
+The component supports 9 options, which are listed below.
 
 
 
@@ -108,6 +110,7 @@ The component supports 8 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.atomix-value.atomix* | The shared AtomixClient instance. The option is a io.atomix.AtomixClient type. |  | String
+| *camel.component.atomix-value.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atomix-value.configuration-uri* | The path to the AtomixClient configuration |  | String
 | *camel.component.atomix-value.configuration.default-action* | The default action. |  | AtomixValue$Action
 | *camel.component.atomix-value.configuration.result-header* | The header that wil carry the result. |  | String
diff --git a/components/camel-avro/src/main/docs/avro-component.adoc b/components/camel-avro/src/main/docs/avro-component.adoc
index aface38..14c0695 100644
--- a/components/camel-avro/src/main/docs/avro-component.adoc
+++ b/components/camel-avro/src/main/docs/avro-component.adoc
@@ -172,7 +172,7 @@ wrapping.
 
 
 // component options: START
-The Avro component supports 2 options, which are listed below.
+The Avro component supports 3 options, which are listed below.
 
 
 
@@ -181,6 +181,7 @@ The Avro component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (advanced) | To use a shared AvroConfiguration to configure options once |  | AvroConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -211,7 +212,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (10 parameters):
+==== Query Parameters (11 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -226,6 +227,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -245,13 +247,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 15 options, which are listed below.
+The component supports 16 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.avro.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.avro.configuration.host* | Hostname to use |  | String
 | *camel.component.avro.configuration.message-name* | The name of the message to send. |  | String
 | *camel.component.avro.configuration.port* | Port number to use |  | Integer
diff --git a/components/camel-avro/src/main/docs/avro-dataformat.adoc b/components/camel-avro/src/main/docs/avro-dataformat.adoc
index 10ad6f72..661874a 100644
--- a/components/camel-avro/src/main/docs/avro-dataformat.adoc
+++ b/components/camel-avro/src/main/docs/avro-dataformat.adoc
@@ -157,13 +157,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 15 options, which are listed below.
+The component supports 16 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.avro.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.avro.configuration.host* | Hostname to use |  | String
 | *camel.component.avro.configuration.message-name* | The name of the message to send. |  | String
 | *camel.component.avro.configuration.port* | Port number to use |  | Integer
diff --git a/components/camel-aws-cw/src/main/docs/aws-cw-component.adoc b/components/camel-aws-cw/src/main/docs/aws-cw-component.adoc
index f37b563..6776d39 100644
--- a/components/camel-aws-cw/src/main/docs/aws-cw-component.adoc
+++ b/components/camel-aws-cw/src/main/docs/aws-cw-component.adoc
@@ -29,7 +29,7 @@ The metrics will be created if they don't already exists. +
 
 
 // component options: START
-The AWS CloudWatch component supports 5 options, which are listed below.
+The AWS CloudWatch component supports 6 options, which are listed below.
 
 
 
@@ -41,6 +41,7 @@ The AWS CloudWatch component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which CW client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -66,7 +67,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (11 parameters):
+==== Query Parameters (12 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -80,6 +81,7 @@ with the following path and query parameters:
 | *timestamp* (producer) | The metric timestamp |  | Date
 | *unit* (producer) | The metric unit |  | String
 | *value* (producer) | The metric value |  | Double
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
@@ -101,7 +103,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 16 options, which are listed below.
+The component supports 17 options, which are listed below.
 
 
 
@@ -109,6 +111,7 @@ The component supports 16 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-cw.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-cw.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-cw.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-cw.configuration.amazon-cw-client* | To use the AmazonCloudWatch as the client |  | AmazonCloudWatch
 | *camel.component.aws-cw.configuration.name* | The metric name |  | String
diff --git a/components/camel-aws-ddb/src/main/docs/aws-ddb-component.adoc b/components/camel-aws-ddb/src/main/docs/aws-ddb-component.adoc
index bf184ad..497745a 100644
--- a/components/camel-aws-ddb/src/main/docs/aws-ddb-component.adoc
+++ b/components/camel-aws-ddb/src/main/docs/aws-ddb-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS DynamoDB component supports 5 options, which are listed below.
+The AWS DynamoDB component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS DynamoDB component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which DDB client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -79,6 +80,7 @@ with the following path and query parameters:
 | *readCapacity* (producer) | The provisioned throughput to reserve for reading resources from your table |  | Long
 | *region* (producer) | The region in which DDB client needs to work |  | String
 | *writeCapacity* (producer) | The provisioned throughput to reserved for writing resources to your table |  | Long
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
@@ -100,7 +102,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 18 options, which are listed below.
+The component supports 19 options, which are listed below.
 
 
 
@@ -108,6 +110,7 @@ The component supports 18 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-ddb.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-ddb.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-ddb.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-ddb.configuration.amazon-d-d-b-client* | To use the AmazonDynamoDB as the client |  | AmazonDynamoDB
 | *camel.component.aws-ddb.configuration.consistent-read* | Determines whether or not strong consistency should be enforced when data is read. | false | Boolean
diff --git a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
index 69ed725..e514ec0 100644
--- a/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
+++ b/components/camel-aws-ddb/src/main/docs/aws-ddbstream-component.adoc
@@ -27,7 +27,7 @@ The stream needs to be created prior to it being used. +
 
 
 // component options: START
-The AWS DynamoDB Streams component supports 5 options, which are listed below.
+The AWS DynamoDB Streams component supports 6 options, which are listed below.
 
 
 
@@ -39,6 +39,7 @@ The AWS DynamoDB Streams component supports 5 options, which are listed below.
 | *secretKey* (consumer) | Amazon AWS Secret Key |  | String
 | *region* (consumer) | Amazon AWS Region |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -66,7 +67,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (28 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -84,6 +85,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -118,7 +120,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 15 options, which are listed below.
+The component supports 16 options, which are listed below.
 
 
 
@@ -126,6 +128,7 @@ The component supports 15 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-ddbstream.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-ddbstream.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-ddbstream.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-ddbstream.configuration.amazon-dynamo-db-streams-client* | Amazon DynamoDB client to use for all requests for this endpoint |  | AmazonDynamoDBStreams
 | *camel.component.aws-ddbstream.configuration.iterator-type* | Defines where in the DynaboDB stream to start getting records. Note that using TRIM_HORIZON can cause a significant delay before the stream has caught up to real-time. if {AT,AFTER}_SEQUENCE_NUMBER are used, then a sequenceNumberProvider MUST be supplied. |  | ShardIteratorType
diff --git a/components/camel-aws-ec2/src/main/docs/aws-ec2-component.adoc b/components/camel-aws-ec2/src/main/docs/aws-ec2-component.adoc
index 76d11f5..35dab5e 100644
--- a/components/camel-aws-ec2/src/main/docs/aws-ec2-component.adoc
+++ b/components/camel-aws-ec2/src/main/docs/aws-ec2-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS EC2 component supports 5 options, which are listed below.
+The AWS EC2 component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS EC2 component supports 5 options, which are listed below.
 | *accessKey* (producer) | Amazon AWS Access Key |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *proxyPort* (producer) | To define a proxy port when instantiating the EC2 client |  | Integer
 | *region* (producer) | The region in which EC2 client needs to work |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -95,7 +97,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
@@ -103,6 +105,7 @@ The component supports 12 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-ec2.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-ec2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-ec2.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-ec2.configuration.amazon-ec2-client* | To use a existing configured AmazonEC2Client as client |  | AmazonEC2
 | *camel.component.aws-ec2.configuration.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags |  | EC2Operations
diff --git a/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc b/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
index ffe9b1b..e61be1b 100644
--- a/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
+++ b/components/camel-aws-ecs/src/main/docs/aws-ecs-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS ECS component supports 5 options, which are listed below.
+The AWS ECS component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS ECS component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which ECS client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *proxyPort* (producer) | To define a proxy port when instantiating the ECS client |  | Integer
 | *region* (producer) | The region in which ECS client needs to work |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -95,7 +97,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
@@ -103,6 +105,7 @@ The component supports 12 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-ecs.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-ecs.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-ecs.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-ecs.configuration.ecs-client* | To use a existing configured AWS ECS as client |  | AmazonECS
 | *camel.component.aws-ecs.configuration.operation* | The operation to perform |  | ECSOperations
diff --git a/components/camel-aws-eks/src/main/docs/aws-eks-component.adoc b/components/camel-aws-eks/src/main/docs/aws-eks-component.adoc
index 1c70483..40c4028 100644
--- a/components/camel-aws-eks/src/main/docs/aws-eks-component.adoc
+++ b/components/camel-aws-eks/src/main/docs/aws-eks-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS EKS component supports 5 options, which are listed below.
+The AWS EKS component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS EKS component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which EKS client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *proxyPort* (producer) | To define a proxy port when instantiating the EKS client |  | Integer
 | *region* (producer) | The region in which EKS client needs to work |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -95,7 +97,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
@@ -103,6 +105,7 @@ The component supports 12 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-eks.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-eks.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-eks.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-eks.configuration.eks-client* | To use a existing configured AWS EKS as client |  | AmazonEKS
 | *camel.component.aws-eks.configuration.operation* | The operation to perform |  | EKSOperations
diff --git a/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc b/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc
index d38cd99..5d94fc9 100644
--- a/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc
+++ b/components/camel-aws-iam/src/main/docs/aws-iam-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS IAM component supports 5 options, which are listed below.
+The AWS IAM component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS IAM component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which IAM client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *proxyPort* (producer) | To define a proxy port when instantiating the IAM client |  | Integer
 | *region* (producer) | The region in which IAM client needs to work |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -95,7 +97,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
@@ -103,6 +105,7 @@ The component supports 12 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-iam.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-iam.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-iam.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-iam.configuration.iam-client* | To use a existing configured AWS IAM as client |  | AmazonIdentity Management
 | *camel.component.aws-iam.configuration.operation* | The operation to perform |  | IAMOperations
diff --git a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
index 24d3e46..6edba8f 100644
--- a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
+++ b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-component.adoc
@@ -27,7 +27,7 @@ The stream needs to be created prior to it being used. +
 
 
 // component options: START
-The AWS Kinesis component supports 5 options, which are listed below.
+The AWS Kinesis component supports 6 options, which are listed below.
 
 
 
@@ -39,6 +39,7 @@ The AWS Kinesis component supports 5 options, which are listed below.
 | *secretKey* (common) | Amazon AWS Secret Key |  | String
 | *region* (common) | Amazon AWS Region |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -67,7 +68,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (30 parameters):
+==== Query Parameters (31 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -87,6 +88,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -121,7 +123,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 17 options, which are listed below.
+The component supports 18 options, which are listed below.
 
 
 
@@ -129,6 +131,7 @@ The component supports 17 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-kinesis.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-kinesis.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-kinesis.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-kinesis.configuration.amazon-kinesis-client* | Amazon Kinesis client to use for all requests for this endpoint |  | AmazonKinesis
 | *camel.component.aws-kinesis.configuration.iterator-type* | Defines where in the Kinesis stream to start getting records |  | ShardIteratorType
diff --git a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc
index 164ea2b..5f57f12 100644
--- a/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc
+++ b/components/camel-aws-kinesis/src/main/docs/aws-kinesis-firehose-component.adoc
@@ -26,7 +26,7 @@ The stream needs to be created prior to it being used. +
 
 
 // component options: START
-The AWS Kinesis Firehose component supports 5 options, which are listed below.
+The AWS Kinesis Firehose component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS Kinesis Firehose component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | Amazon AWS Region |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -66,7 +67,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (7 parameters):
+==== Query Parameters (8 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *proxyHost* (producer) | To define a proxy host when instantiating the DDBStreams client |  | String
 | *proxyPort* (producer) | To define a proxy port when instantiating the DDBStreams client |  | Integer
 | *region* (producer) | The region in which Kinesis client needs to work |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
@@ -97,7 +99,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
@@ -105,6 +107,7 @@ The component supports 12 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-kinesis-firehose.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-kinesis-firehose.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-kinesis-firehose.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-kinesis-firehose.configuration.amazon-kinesis-firehose-client* | Amazon Kinesis Firehose client to use for all requests for this endpoint |  | AmazonKinesisFirehose
 | *camel.component.aws-kinesis-firehose.configuration.proxy-host* | To define a proxy host when instantiating the DDBStreams client |  | String
diff --git a/components/camel-aws-kms/src/main/docs/aws-kms-component.adoc b/components/camel-aws-kms/src/main/docs/aws-kms-component.adoc
index cc4fc09..41ba9a2 100644
--- a/components/camel-aws-kms/src/main/docs/aws-kms-component.adoc
+++ b/components/camel-aws-kms/src/main/docs/aws-kms-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS KMS component supports 5 options, which are listed below.
+The AWS KMS component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS KMS component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which KMS client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *proxyPort* (producer) | To define a proxy port when instantiating the KMS client |  | Integer
 | *region* (producer) | The region in which KMS client needs to work |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -95,7 +97,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
@@ -103,6 +105,7 @@ The component supports 12 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-kms.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-kms.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-kms.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-kms.configuration.kms-client* | To use a existing configured AWS KMS as client |  | AWSKMS
 | *camel.component.aws-kms.configuration.operation* | The operation to perform |  | KMSOperations
diff --git a/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc b/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc
index dde8249..72d57a6 100644
--- a/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc
+++ b/components/camel-aws-lambda/src/main/docs/aws-lambda-component.adoc
@@ -32,7 +32,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS Lambda component supports 5 options, which are listed below.
+The AWS Lambda component supports 6 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The AWS Lambda component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | Amazon AWS Region |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -69,7 +70,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -78,6 +79,7 @@ with the following path and query parameters:
 | *operation* (producer) | *Required* The operation to perform. It can be listFunctions, getFunction, createFunction, deleteFunction or invokeFunction |  | LambdaOperations
 | *region* (producer) | Amazon AWS Region |  | String
 | *awsLambdaClient* (advanced) | To use a existing configured AwsLambdaClient as client |  | AWSLambda
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *proxyHost* (proxy) | To define a proxy host when instantiating the Lambda client |  | String
 | *proxyPort* (proxy) | To define a proxy port when instantiating the Lambda client |  | Integer
@@ -101,7 +103,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 13 options, which are listed below.
+The component supports 14 options, which are listed below.
 
 
 
@@ -109,6 +111,7 @@ The component supports 13 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-lambda.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-lambda.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-lambda.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-lambda.configuration.aws-lambda-client* | To use a existing configured AwsLambdaClient as client |  | AWSLambda
 | *camel.component.aws-lambda.configuration.function* | Name of the Lambda function. |  | String
diff --git a/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc b/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc
index 6799e69..934503c 100644
--- a/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc
+++ b/components/camel-aws-mq/src/main/docs/aws-mq-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS MQ component supports 5 options, which are listed below.
+The AWS MQ component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS MQ component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which MQ client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *proxyPort* (producer) | To define a proxy port when instantiating the MQ client |  | Integer
 | *region* (producer) | The region in which MQ client needs to work |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -95,7 +97,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
@@ -103,6 +105,7 @@ The component supports 12 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-mq.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-mq.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-mq.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-mq.configuration.amazon-mq-client* | To use a existing configured AmazonMQClient as client |  | AmazonMQ
 | *camel.component.aws-mq.configuration.operation* | The operation to perform. It can be listBrokers,createBroker,deleteBroker |  | MQOperations
diff --git a/components/camel-aws-msk/src/main/docs/aws-msk-component.adoc b/components/camel-aws-msk/src/main/docs/aws-msk-component.adoc
index 35c8505..41fcb7a 100644
--- a/components/camel-aws-msk/src/main/docs/aws-msk-component.adoc
+++ b/components/camel-aws-msk/src/main/docs/aws-msk-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS MSK component supports 5 options, which are listed below.
+The AWS MSK component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS MSK component supports 5 options, which are listed below.
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which MSK client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *proxyPort* (producer) | To define a proxy port when instantiating the MSK client |  | Integer
 | *region* (producer) | The region in which MSK client needs to work |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -96,7 +98,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
@@ -104,6 +106,7 @@ The component supports 12 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-msk.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-msk.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-msk.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-msk.configuration.msk-client* | To use a existing configured AWS MSK as client |  | AWSKafka
 | *camel.component.aws-msk.configuration.operation* | The operation to perform |  | MSKOperations
diff --git a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
index 937445a..e5a3120 100644
--- a/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
+++ b/components/camel-aws-s3/src/main/docs/aws-s3-component.adoc
@@ -36,7 +36,7 @@ from("aws-s3:helloBucket?accessKey=yourAccessKey&secretKey=yourSecretKey&prefix=
 
 
 // component options: START
-The AWS S3 Storage Service component supports 5 options, which are listed below.
+The AWS S3 Storage Service component supports 6 options, which are listed below.
 
 
 
@@ -48,6 +48,7 @@ The AWS S3 Storage Service component supports 5 options, which are listed below.
 | *secretKey* (common) | Amazon AWS Secret Key |  | String
 | *region* (common) | The region where the bucket is located. This option is used in the com.amazonaws.services.s3.model.CreateBucketRequest. |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -80,7 +81,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (51 parameters):
+==== Query Parameters (52 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -116,6 +117,7 @@ with the following path and query parameters:
 | *storageClass* (producer) | The storage class to set in the com.amazonaws.services.s3.model.PutObjectRequest request. |  | String
 | *awsKMSKeyId* (producer) | Define the id of KMS key to use in case KMS is enabled |  | String
 | *useAwsKMS* (producer) | Define if KMS must be used or not | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accelerateModeEnabled* ( advanced) | Define if Accelerate Mode enabled is true or false | false | boolean
 | *chunkedEncodingDisabled* ( advanced) | Define if disabled Chunked Encoding is true or false | false | boolean
@@ -155,7 +157,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 36 options, which are listed below.
+The component supports 37 options, which are listed below.
 
 
 
@@ -163,6 +165,7 @@ The component supports 36 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-s3.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-s3.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-s3.configuration.accelerate-mode-enabled* | Define if Accelerate Mode enabled is true or false | false | Boolean
 | *camel.component.aws-s3.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-s3.configuration.amazon-s3-client* | Reference to a `com.amazonaws.services.s3.AmazonS3` in the link:registry.html[Registry]. |  | AmazonS3
diff --git a/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc b/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc
index c074028..7079603 100644
--- a/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc
+++ b/components/camel-aws-sdb/src/main/docs/aws-sdb-component.adoc
@@ -26,7 +26,16 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS SimpleDB component has no options.
+The AWS SimpleDB component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -51,7 +60,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (10 parameters):
+==== Query Parameters (11 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -66,6 +75,7 @@ with the following path and query parameters:
 | *proxyPort* (producer) | To define a proxy port when instantiating the SDB client |  | Integer
 | *region* (producer) | The region in which SDB client needs to work |  | String
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -85,13 +95,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.aws-sdb.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-sdb.enabled* | Whether to enable auto configuration of the aws-sdb component. This is enabled by default. |  | Boolean
 | *camel.component.aws-sdb.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-aws-ses/src/main/docs/aws-ses-component.adoc b/components/camel-aws-ses/src/main/docs/aws-ses-component.adoc
index ab36c2f..14a561a 100644
--- a/components/camel-aws-ses/src/main/docs/aws-ses-component.adoc
+++ b/components/camel-aws-ses/src/main/docs/aws-ses-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS Simple Email Service component supports 5 options, which are listed below.
+The AWS Simple Email Service component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS Simple Email Service component supports 5 options, which are listed belo
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which SES client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (11 parameters):
+==== Query Parameters (12 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -77,6 +78,7 @@ with the following path and query parameters:
 | *returnPath* (producer) | The email address to which bounce notifications are to be forwarded, override it using 'CamelAwsSesReturnPath' header. |  | String
 | *subject* (producer) | The subject which is used if the message header 'CamelAwsSesSubject' is not present. |  | String
 | *to* (producer) | List of destination email address. Can be overriden with 'CamelAwsSesTo' header. |  | List
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
@@ -98,7 +100,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 16 options, which are listed below.
+The component supports 17 options, which are listed below.
 
 
 
@@ -106,6 +108,7 @@ The component supports 16 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-ses.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-ses.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-ses.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-ses.configuration.amazon-s-e-s-client* | To use the AmazonSimpleEmailService as the client |  | AmazonSimpleEmail Service
 | *camel.component.aws-ses.configuration.from* | The sender's email address. |  | String
diff --git a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
index a18eab0..62fa6ed 100644
--- a/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
+++ b/components/camel-aws-sns/src/main/docs/aws-sns-component.adoc
@@ -29,7 +29,7 @@ The topic will be created if they don't already exists. +
 
 
 // component options: START
-The AWS Simple Notification System component supports 5 options, which are listed below.
+The AWS Simple Notification System component supports 6 options, which are listed below.
 
 
 
@@ -41,6 +41,7 @@ The AWS Simple Notification System component supports 5 options, which are liste
 | *secretKey* (producer) | Amazon AWS Secret Key |  | String
 | *region* (producer) | The region in which SNS client needs to work |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -67,7 +68,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -86,6 +87,7 @@ with the following path and query parameters:
 | *serverSideEncryptionEnabled* (producer) | Define if Server Side Encryption is enabled or not on the topic | false | boolean
 | *subject* (producer) | The subject which is used if the message header 'CamelAwsSnsSubject' is not present. |  | String
 | *subscribeSNStoSQS* (producer) | Define if the subscription between SNS Topic and SQS must be done or not | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accessKey* (security) | Amazon AWS Access Key |  | String
 | *secretKey* (security) | Amazon AWS Secret Key |  | String
@@ -107,7 +109,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 21 options, which are listed below.
+The component supports 22 options, which are listed below.
 
 
 
@@ -115,6 +117,7 @@ The component supports 21 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-sns.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-sns.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-sns.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-sns.configuration.amazon-s-n-s-client* | To use the AmazonSNS as the client |  | AmazonSNS
 | *camel.component.aws-sns.configuration.amazon-s-q-s-client* | An SQS Client to use as bridge between SNS and SQS |  | AmazonSQS
diff --git a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
index 3b404da..4784854 100644
--- a/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
+++ b/components/camel-aws-sqs/src/main/docs/aws-sqs-component.adoc
@@ -27,7 +27,7 @@ The queue will be created if they don't already exists. +
 
 
 // component options: START
-The AWS Simple Queue Service component supports 5 options, which are listed below.
+The AWS Simple Queue Service component supports 6 options, which are listed below.
 
 
 
@@ -39,6 +39,7 @@ The AWS Simple Queue Service component supports 5 options, which are listed belo
 | *secretKey* (common) | Amazon AWS Secret Key |  | String
 | *region* (common) | Specify the queue region which could be used with queueOwnerAWSAccountId to build the service URL. |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -68,7 +69,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (52 parameters):
+==== Query Parameters (53 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -101,6 +102,7 @@ with the following path and query parameters:
 | *messageDeduplicationId Strategy* (producer) | Only for FIFO queues. Strategy for setting the messageDeduplicationId on the message. Can be one of the following options: useExchangeId, useContentBasedDeduplication. For the useContentBasedDeduplication option, no messageDeduplicationId will be set on the message. | useExchangeId | MessageDeduplicationId Strategy
 | *messageGroupIdStrategy* (producer) | Only for FIFO queues. Strategy for setting the messageGroupId on the message. Can be one of the following options: useConstant, useExchangeId, usePropertyValue. For the usePropertyValue option, the value of property CamelAwsMessageGroupId will be used. |  | MessageGroupIdStrategy
 | *operation* (producer) | The operation to do in case the user don't want to send only a message |  | SqsOperations
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *delayQueue* (advanced) | Define if you want to apply delaySeconds option to the queue or on single messages | false | boolean
 | *queueUrl* (advanced) | To define the queueUrl explicitly. All other parameters, which would influence the queueUrl, are ignored. This parameter is intended to be used, to connect to a mock implementation of SQS, for testing purposes. |  | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
@@ -144,7 +146,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 37 options, which are listed below.
+The component supports 38 options, which are listed below.
 
 
 
@@ -152,6 +154,7 @@ The component supports 37 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-sqs.access-key* | Amazon AWS Access Key |  | String
+| *camel.component.aws-sqs.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-sqs.configuration.access-key* | Amazon AWS Access Key |  | String
 | *camel.component.aws-sqs.configuration.amazon-a-w-s-host* | The hostname of the Amazon AWS cloud. | amazonaws.com | String
 | *camel.component.aws-sqs.configuration.amazon-s-q-s-client* | To use the AmazonSQS as client |  | AmazonSQS
diff --git a/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc b/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
index d4b0369..74f3e25 100644
--- a/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
+++ b/components/camel-aws-swf/src/main/docs/aws-swf-component.adoc
@@ -26,7 +26,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The AWS Simple Workflow component supports 5 options, which are listed below.
+The AWS Simple Workflow component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The AWS Simple Workflow component supports 5 options, which are listed below.
 | *secretKey* (common) | Amazon AWS Secret Key. |  | String
 | *region* (common) | Amazon AWS Region. |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -63,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (30 parameters):
+==== Query Parameters (31 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -78,6 +79,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *clientConfiguration Parameters* (advanced) | To configure the ClientConfiguration using the key/values from the Map. |  | Map
 | *startWorkflowOptions Parameters* (advanced) | To configure the StartWorkflowOptions using the key/values from the Map. |  | Map
 | *sWClientParameters* (advanced) | To configure the AmazonSimpleWorkflowClient using the key/values from the Map. |  | Map
@@ -117,7 +119,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 32 options, which are listed below.
+The component supports 33 options, which are listed below.
 
 
 
@@ -125,6 +127,7 @@ The component supports 32 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.aws-swf.access-key* | Amazon AWS Access Key. |  | String
+| *camel.component.aws-swf.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.aws-swf.configuration.access-key* | Amazon AWS Access Key. |  | String
 | *camel.component.aws-swf.configuration.activity-list* | The list name to consume activities from. |  | String
 | *camel.component.aws-swf.configuration.activity-scheduling-options* | Activity scheduling options |  | ActivityScheduling Options
diff --git a/components/camel-azure/src/main/docs/azure-blob-component.adoc b/components/camel-azure/src/main/docs/azure-blob-component.adoc
index d73b6b8..32bc4d9 100644
--- a/components/camel-azure/src/main/docs/azure-blob-component.adoc
+++ b/components/camel-azure/src/main/docs/azure-blob-component.adoc
@@ -35,7 +35,7 @@ to("file://blobdirectory");
 
 
 // component options: START
-The Azure Storage Blob Service component supports 2 options, which are listed below.
+The Azure Storage Blob Service component supports 3 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The Azure Storage Blob Service component supports 2 options, which are listed be
 | Name | Description | Default | Type
 | *configuration* (advanced) | The Blob Service configuration |  | BlobService Configuration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -76,7 +77,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (19 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,6 +101,7 @@ with the following path and query parameters:
 | *operation* (producer) | Blob service operation hint to the producer | listBlobs | BlobServiceOperations
 | *streamWriteSize* (producer) | Set the size of the buffer for writing block and page blocks |  | int
 | *useFlatListing* (producer) | Specify if the flat or hierarchical blob listing should be used | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -119,13 +121,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 20 options, which are listed below.
+The component supports 21 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.azure-blob.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.azure-blob.configuration.account-name* | Set the Azure account name |  | String
 | *camel.component.azure-blob.configuration.azure-blob-client* | The blob service client |  | CloudBlob
 | *camel.component.azure-blob.configuration.blob-metadata* | Set the blob meta-data |  | Map
diff --git a/components/camel-azure/src/main/docs/azure-queue-component.adoc b/components/camel-azure/src/main/docs/azure-queue-component.adoc
index 3a28b95..a5189df 100644
--- a/components/camel-azure/src/main/docs/azure-queue-component.adoc
+++ b/components/camel-azure/src/main/docs/azure-queue-component.adoc
@@ -35,7 +35,7 @@ to("file://queuedirectory");
 
 
 // component options: START
-The Azure Storage Queue Service component supports 2 options, which are listed below.
+The Azure Storage Queue Service component supports 3 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The Azure Storage Queue Service component supports 2 options, which are listed b
 | Name | Description | Default | Type
 | *configuration* (advanced) | The Queue Service configuration |  | QueueService Configuration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -76,7 +77,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (10 parameters):
+==== Query Parameters (11 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,6 +92,7 @@ with the following path and query parameters:
 | *messageVisibilityDelay* (producer) | Message Visibility Delay in seconds |  | int
 | *operation* (producer) | Queue service operation hint to the producer | listQueues | QueueServiceOperations
 | *queuePrefix* (producer) | Set a prefix which can be used for listing the queues |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -110,13 +112,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 10 options, which are listed below.
+The component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.azure-queue.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.azure-queue.configuration.account-name* | Set the Azure account name |  | String
 | *camel.component.azure-queue.configuration.azure-queue-client* | The queue service client |  | CloudQueue
 | *camel.component.azure-queue.configuration.credentials* | Set the storage credentials, required in most cases |  | StorageCredentials
diff --git a/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc b/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc
index e7e11d4..49724f4 100644
--- a/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc
+++ b/components/camel-bean-validator/src/main/docs/bean-validator-component.adoc
@@ -45,7 +45,16 @@ Where *label* is an arbitrary text value describing the endpoint. +
 
 
 // component options: START
-The Bean Validator component has no options.
+The Bean Validator component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -69,7 +78,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (6 parameters):
+==== Query Parameters (7 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -80,6 +89,7 @@ with the following path and query parameters:
 | *messageInterpolator* (producer) | To use a custom MessageInterpolator |  | MessageInterpolator
 | *traversableResolver* (producer) | To use a custom TraversableResolver |  | TraversableResolver
 | *validationProviderResolver* (producer) | To use a a custom ValidationProviderResolver |  | ValidationProvider Resolver
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -99,13 +109,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.bean-validator.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.bean-validator.enabled* | Enable bean-validator component | true | Boolean
 | *camel.component.bean-validator.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-bean/src/main/docs/bean-component.adoc b/components/camel-bean/src/main/docs/bean-component.adoc
index 30b96b2..98722e5 100644
--- a/components/camel-bean/src/main/docs/bean-component.adoc
+++ b/components/camel-bean/src/main/docs/bean-component.adoc
@@ -19,7 +19,7 @@ the Registry
 
 
 // component options: START
-The Bean component supports 2 options, which are listed below.
+The Bean component supports 3 options, which are listed below.
 
 
 
@@ -28,6 +28,7 @@ The Bean component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *cache* (advanced) | If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. |  | Boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -52,13 +53,14 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (4 parameters):
+==== Query Parameters (5 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *method* (producer) | Sets the name of the method to invoke on the bean |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *cache* (advanced) | If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. |  | Boolean
 | *parameters* (advanced) | Used for configuring additional properties on the bean |  | Map
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
diff --git a/components/camel-bean/src/main/docs/class-component.adoc b/components/camel-bean/src/main/docs/class-component.adoc
index 83a9c98..919bb65 100644
--- a/components/camel-bean/src/main/docs/class-component.adoc
+++ b/components/camel-bean/src/main/docs/class-component.adoc
@@ -22,7 +22,7 @@ bean.
 
 
 // component options: START
-The Class component supports 2 options, which are listed below.
+The Class component supports 3 options, which are listed below.
 
 
 
@@ -31,6 +31,7 @@ The Class component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *cache* (advanced) | If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. |  | Boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -55,13 +56,14 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (4 parameters):
+==== Query Parameters (5 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *method* (producer) | Sets the name of the method to invoke on the bean |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *cache* (advanced) | If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. |  | Boolean
 | *parameters* (advanced) | Used for configuring additional properties on the bean |  | Map
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
diff --git a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
index 9f28172..2f72bfb 100644
--- a/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
+++ b/components/camel-beanstalk/src/main/docs/beanstalk-component.adoc
@@ -58,7 +58,7 @@ into Beanstalk.
 
 
 // component options: START
-The Beanstalk component supports 2 options, which are listed below.
+The Beanstalk component supports 3 options, which are listed below.
 
 
 
@@ -67,6 +67,7 @@ The Beanstalk component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *connectionSettings Factory* (common) | Custom ConnectionSettingsFactory. Specify which ConnectionSettingsFactory to use to make connections to Beanstalkd. Especially useful for unit testing without beanstalkd daemon (you can mock ConnectionSettings) |  | ConnectionSettings Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -92,7 +93,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (26 parameters):
+==== Query Parameters (27 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -110,6 +111,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -142,13 +144,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.beanstalk.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.beanstalk.connection-settings-factory* | Custom ConnectionSettingsFactory. Specify which ConnectionSettingsFactory to use to make connections to Beanstalkd. Especially useful for unit testing without beanstalkd daemon (you can mock ConnectionSettings). The option is a org.apache.camel.component.beanstalk.ConnectionSettingsFactory type. |  | String
 | *camel.component.beanstalk.enabled* | Enable beanstalk component | true | Boolean
 | *camel.component.beanstalk.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-bonita/src/main/docs/bonita-component.adoc b/components/camel-bonita/src/main/docs/bonita-component.adoc
index da59843..41f7237 100644
--- a/components/camel-bonita/src/main/docs/bonita-component.adoc
+++ b/components/camel-bonita/src/main/docs/bonita-component.adoc
@@ -17,7 +17,16 @@ Where *operation* is the specific action to perform on Bonita.
 ### General Options
 
 // component options: START
-The Bonita component has no options.
+The Bonita component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -40,7 +49,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (9 parameters):
+==== Query Parameters (10 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -52,6 +61,7 @@ with the following path and query parameters:
 | *processName* (consumer) | Name of the process involved in the operation |  | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *password* (security) | Password to authenticate to Bonita engine. |  | String
 | *username* (security) | Username to authenticate to Bonita engine. |  | String
@@ -73,13 +83,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.bonita.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.bonita.enabled* | Enable bonita component | true | Boolean
 | *camel.component.bonita.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
index 7dbc251..949a33c 100644
--- a/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
+++ b/components/camel-box/camel-box-component/src/main/docs/box-component.adoc
@@ -48,7 +48,7 @@ The Box component supports three different types of authenticated connections.
 === Box Options
 
 // component options: START
-The Box component supports 2 options, which are listed below.
+The Box component supports 3 options, which are listed below.
 
 
 
@@ -57,6 +57,7 @@ The Box component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (common) | To use the shared configuration |  | BoxConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -80,7 +81,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -93,6 +94,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpParams* (advanced) | Custom HTTP params for settings like proxy host |  | Map
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accessTokenCache* (security) | Custom Access Token Cache for storing and retrieving access tokens. |  | IAccessTokenCache
@@ -124,13 +126,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 19 options, which are listed below.
+The component supports 20 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.box.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.box.configuration.access-token-cache* | Custom Access Token Cache for storing and retrieving access tokens. |  | IAccessTokenCache
 | *camel.component.box.configuration.api-name* | What kind of operation to perform |  | BoxApiName
 | *camel.component.box.configuration.authentication-type* | The type of authentication for connection. <p> Types of Authentication: <ul> <li>STANDARD_AUTHENTICATION - OAuth 2.0 (3-legged)</li> <li>SERVER_AUTHENTICATION - OAuth 2.0 with JSON Web Tokens</li> </ul> | APP_USER_AUTHENTICATION | String
diff --git a/components/camel-braintree/src/main/docs/braintree-component.adoc b/components/camel-braintree/src/main/docs/braintree-component.adoc
index 2cd4bfd..17b0b57 100644
--- a/components/camel-braintree/src/main/docs/braintree-component.adoc
+++ b/components/camel-braintree/src/main/docs/braintree-component.adoc
@@ -36,7 +36,7 @@ for this component:
 
 
 // component options: START
-The Braintree component supports 2 options, which are listed below.
+The Braintree component supports 3 options, which are listed below.
 
 
 
@@ -45,6 +45,7 @@ The Braintree component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (common) | To use the shared configuration |  | BraintreeConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -72,7 +73,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (14 parameters):
+==== Query Parameters (15 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -87,6 +88,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *accessToken* (advanced) | The access token granted by a merchant to another in order to process transactions on their behalf. Used in place of environment, merchant id, public key and private key fields. |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *httpReadTimeout* (advanced) | Set read timeout for http calls. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *httpLogLevel* (logging) | Set logging level for http calls, see java.util.logging.Level |  | String
@@ -110,13 +112,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 14 options, which are listed below.
+The component supports 15 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.braintree.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.braintree.configuration.access-token* | The access token granted by a merchant to another in order to process transactions on their behalf. Used in place of environment, merchant id, public key and private key fields. |  | String
 | *camel.component.braintree.configuration.api-name* | What kind of operation to perform |  | BraintreeApiName
 | *camel.component.braintree.configuration.environment* | The environment Either SANDBOX or PRODUCTION |  | String
diff --git a/components/camel-browse/src/main/docs/browse-component.adoc b/components/camel-browse/src/main/docs/browse-component.adoc
index 9b050f7..4799d67 100644
--- a/components/camel-browse/src/main/docs/browse-component.adoc
+++ b/components/camel-browse/src/main/docs/browse-component.adoc
@@ -22,7 +22,16 @@ Where *someName* can be any string to uniquely identify the endpoint.
 
 
 // component options: START
-The Browse component has no options.
+The Browse component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -46,7 +55,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (4 parameters):
+==== Query Parameters (5 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -55,6 +64,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -75,13 +85,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.browse.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.browse.enabled* | Whether to enable auto configuration of the browse component. This is enabled by default. |  | Boolean
 | *camel.component.browse.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc b/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
index 38ec07a..eacf4de 100644
--- a/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
+++ b/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
@@ -33,7 +33,7 @@ format, `?option=value&option=#beanRef&...`
 
 
 // component options: START
-The Caffeine Cache component supports 2 options, which are listed below.
+The Caffeine Cache component supports 3 options, which are listed below.
 
 
 
@@ -42,6 +42,7 @@ The Caffeine Cache component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (advanced) | Sets the global component configuration |  | CaffeineConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -66,7 +67,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (19 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -88,6 +89,7 @@ with the following path and query parameters:
 | *removalListener* (producer) | Set a specific removal Listener for the cache |  | RemovalListener
 | *statsCounter* (producer) | Set a specific Stats Counter for the cache stats |  | StatsCounter
 | *statsEnabled* (producer) | To enable stats on the cache | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *keyType* (advanced) | The cache key type, default java.lang.Object | java.lang.Object | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *valueType* (advanced) | The cache value type, default java.lang.Object | java.lang.Object | String
@@ -109,13 +111,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 17 options, which are listed below.
+The component supports 18 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.caffeine-cache.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.caffeine-cache.configuration.action* | To configure the default cache action. If an action is set in the message header, then the operation from the header takes precedence. |  | String
 | *camel.component.caffeine-cache.configuration.cache* | To configure an already instantiated cache to be used |  | Cache
 | *camel.component.caffeine-cache.configuration.cache-loader* | To configure a CacheLoader in case of a LoadCache use |  | CacheLoader
diff --git a/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc b/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
index 729492e..3bbe68f 100644
--- a/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
+++ b/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
@@ -33,7 +33,7 @@ format, `?option=value&option=#beanRef&...`
 
 
 // component options: START
-The Caffeine LoadCache component supports 2 options, which are listed below.
+The Caffeine LoadCache component supports 3 options, which are listed below.
 
 
 
@@ -42,6 +42,7 @@ The Caffeine LoadCache component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (advanced) | Sets the global component configuration |  | CaffeineConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -66,7 +67,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (19 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -88,6 +89,7 @@ with the following path and query parameters:
 | *removalListener* (producer) | Set a specific removal Listener for the cache |  | RemovalListener
 | *statsCounter* (producer) | Set a specific Stats Counter for the cache stats |  | StatsCounter
 | *statsEnabled* (producer) | To enable stats on the cache | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *keyType* (advanced) | The cache key type, default java.lang.Object | java.lang.Object | String
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *valueType* (advanced) | The cache value type, default java.lang.Object | java.lang.Object | String
@@ -109,13 +111,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 17 options, which are listed below.
+The component supports 18 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.caffeine-loadcache.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.caffeine-loadcache.configuration.action* | To configure the default cache action. If an action is set in the message header, then the operation from the header takes precedence. |  | String
 | *camel.component.caffeine-loadcache.configuration.cache* | To configure an already instantiated cache to be used |  | Cache
 | *camel.component.caffeine-loadcache.configuration.cache-loader* | To configure a CacheLoader in case of a LoadCache use |  | CacheLoader
diff --git a/components/camel-cassandraql/src/main/docs/cql-component.adoc b/components/camel-cassandraql/src/main/docs/cql-component.adoc
index d1570bc..8c9a878 100644
--- a/components/camel-cassandraql/src/main/docs/cql-component.adoc
+++ b/components/camel-cassandraql/src/main/docs/cql-component.adoc
@@ -55,7 +55,16 @@ your own Cluster instance and give it to the Camel endpoint.
 
 
 // component options: START
-The Cassandra CQL component has no options.
+The Cassandra CQL component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -82,7 +91,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (29 parameters):
+==== Query Parameters (30 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -103,6 +112,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -135,13 +145,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.cql.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.cql.enabled* | Enable cql component | true | Boolean
 | *camel.component.cql.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-chatscript/src/main/docs/chatscript-component.adoc b/components/camel-chatscript/src/main/docs/chatscript-component.adoc
index b4f2a08..6d7d547 100644
--- a/components/camel-chatscript/src/main/docs/chatscript-component.adoc
+++ b/components/camel-chatscript/src/main/docs/chatscript-component.adoc
@@ -41,7 +41,16 @@ ChatScript:host:[port]/botName[?options]
 ### Options
 
 // component options: START
-The ChatScript component has no options.
+The ChatScript component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -65,12 +74,13 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (3 parameters):
+==== Query Parameters (4 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *resetchat* (reset) | Issues :reset command to start a new conversation everytime | false | boolean
 | *chatUserName* (username) | Username who initializes the CS conversation. To be set when chat is initialized from camel route |  | String
@@ -93,13 +103,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.chatscript.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.chatscript.enabled* | Whether to enable auto configuration of the chatscript component. This is enabled by default. |  | Boolean
 | *camel.component.chatscript.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-chunk/src/main/docs/chunk-component.adoc b/components/camel-chunk/src/main/docs/chunk-component.adoc
index c33563f..27d4ff6 100644
--- a/components/camel-chunk/src/main/docs/chunk-component.adoc
+++ b/components/camel-chunk/src/main/docs/chunk-component.adoc
@@ -37,7 +37,16 @@ format, `?option=value&option=value&...`
 
 
 // component options: START
-The Chunk component has no options.
+The Chunk component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -61,7 +70,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (7 parameters):
+==== Query Parameters (8 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -73,6 +82,7 @@ with the following path and query parameters:
 | *themeFolder* (producer) | Define the themes folder to scan |  | String
 | *themeLayer* (producer) | Define the theme layer to elaborate |  | String
 | *themeSubfolder* (producer) | Define the themes subfolder to scan |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -92,13 +102,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.chunk.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.chunk.enabled* | Enable chunk component | true | Boolean
 | *camel.component.chunk.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
index fa018a4..14754a5 100644
--- a/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
+++ b/components/camel-cm-sms/src/main/docs/cm-sms-component.adoc
@@ -32,7 +32,16 @@ for this component:
 
 
 // component options: START
-The CM SMS Gateway component has no options.
+The CM SMS Gateway component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -56,7 +65,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (5 parameters):
+==== Query Parameters (6 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -66,6 +75,7 @@ with the following path and query parameters:
 | *defaultMaxNumberOfParts* (producer) | If it is a multipart message forces the max number. Message can be truncated. Technically the gateway will first check if a message is larger than 160 characters, if so, the message will be cut into multiple 153 characters parts limited by these parameters. | 8 | Max(8L)::Int)
 | *productToken* (producer) | *Required* The unique token to use |  | String)
 | *testConnectionOnStartup* (producer) | Whether to test the connection to the SMS Gateway on startup | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -85,13 +95,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.cm-sms.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.cm-sms.enabled* | Enable cm-sms component | true | Boolean
 | *camel.component.cm-sms.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-cmis/src/main/docs/cmis-component.adoc b/components/camel-cmis/src/main/docs/cmis-component.adoc
index 7a3a0dd..fd92b51 100644
--- a/components/camel-cmis/src/main/docs/cmis-component.adoc
+++ b/components/camel-cmis/src/main/docs/cmis-component.adoc
@@ -22,7 +22,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The CMIS component supports 2 options, which are listed below.
+The CMIS component supports 3 options, which are listed below.
 
 
 
@@ -31,6 +31,7 @@ The CMIS component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *sessionFacadeFactory* (common) | To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances |  | CMISSessionFacade Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -55,7 +56,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -70,6 +71,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *queryMode* (producer) | If true, will execute the cmis query from the message body and return result, otherwise will create a node in the cmis repository | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *sessionFacadeFactory* (advanced) | To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances |  | CMISSessionFacade Factory
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *password* (security) | Password for the cmis repository |  | String
@@ -92,13 +94,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.cmis.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.cmis.enabled* | Enable cmis component | true | Boolean
 | *camel.component.cmis.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 | *camel.component.cmis.session-facade-factory* | To use a custom CMISSessionFacadeFactory to create the CMISSessionFacade instances. The option is a org.apache.camel.component.cmis.CMISSessionFacadeFactory type. |  | String
diff --git a/components/camel-coap/src/main/docs/coap-component.adoc b/components/camel-coap/src/main/docs/coap-component.adoc
index 8cea57e..1114eda 100644
--- a/components/camel-coap/src/main/docs/coap-component.adoc
+++ b/components/camel-coap/src/main/docs/coap-component.adoc
@@ -42,7 +42,16 @@ for this component:
 
 
 // component options: START
-The CoAP component has no options.
+The CoAP component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -67,7 +76,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -85,6 +94,7 @@ with the following path and query parameters:
 | *coapMethodRestrict* (consumer) | Comma separated list of methods that the CoAP consumer will bind to. The default is to bind to all methods (DELETE, GET, POST, PUT). |  | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -104,13 +114,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.coap.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.coap.enabled* | Enable coap component | true | Boolean
 | *camel.component.coap.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-cometd/src/main/docs/cometd-component.adoc b/components/camel-cometd/src/main/docs/cometd-component.adoc
index bc46568..9fa0766 100644
--- a/components/camel-cometd/src/main/docs/cometd-component.adoc
+++ b/components/camel-cometd/src/main/docs/cometd-component.adoc
@@ -49,7 +49,7 @@ where `cometds:` represents an SSL configured endpoint.
 
 
 // component options: START
-The CometD component supports 8 options, which are listed below.
+The CometD component supports 9 options, which are listed below.
 
 
 
@@ -64,6 +64,7 @@ The CometD component supports 8 options, which are listed below.
 | *sslContextParameters* (security) | To configure security using SSLContextParameters |  | SSLContextParameters
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -93,7 +94,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -114,6 +115,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *disconnectLocalSession* (producer) | Whether to disconnect local sessions after publishing a message to its channel. Disconnecting local session is needed as they are not swept by default by CometD, and therefore you can run out of memory. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -133,13 +135,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.cometd.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.cometd.enabled* | Enable cometd component | true | Boolean
 | *camel.component.cometd.extensions* | To use a list of custom BayeuxServer.Extension that allows modifying incoming and outgoing requests. |  | List
 | *camel.component.cometd.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-consul/src/main/docs/consul-component.adoc b/components/camel-consul/src/main/docs/consul-component.adoc
index f40144d..a6bc893 100644
--- a/components/camel-consul/src/main/docs/consul-component.adoc
+++ b/components/camel-consul/src/main/docs/consul-component.adoc
@@ -36,7 +36,7 @@ You can append query options to the URI in the following format:
 
 
 // component options: START
-The Consul component supports 9 options, which are listed below.
+The Consul component supports 10 options, which are listed below.
 
 
 
@@ -52,6 +52,7 @@ The Consul component supports 9 options, which are listed below.
 | *password* (common) | Sets the password to be used for basic authentication |  | String
 | *configuration* (advanced) | Sets the common configuration shared among endpoints |  | ConsulConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -79,7 +80,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (4 parameters):
+==== Query Parameters (5 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -88,6 +89,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -107,7 +109,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 90 options, which are listed below.
+The component supports 91 options, which are listed below.
 
 
 
@@ -115,6 +117,7 @@ The component supports 90 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.consul.acl-token* | Sets the ACL token to be used with Consul |  | String
+| *camel.component.consul.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.consul.cluster.service.acl-token* |  |  | String
 | *camel.component.consul.cluster.service.attributes* | Custom service attributes. |  | Map
 | *camel.component.consul.cluster.service.block-seconds* |  |  | Integer
diff --git a/components/camel-controlbus/src/main/docs/controlbus-component.adoc b/components/camel-controlbus/src/main/docs/controlbus-component.adoc
index 55f4853..ddac7c5 100644
--- a/components/camel-controlbus/src/main/docs/controlbus-component.adoc
+++ b/components/camel-controlbus/src/main/docs/controlbus-component.adoc
@@ -62,7 +62,16 @@ then the result is put in the message body.
 
 
 // component options: START
-The Control Bus component has no options.
+The Control Bus component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -87,7 +96,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (6 parameters):
+==== Query Parameters (7 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +107,7 @@ with the following path and query parameters:
 | *loggingLevel* (producer) | Logging level used for logging when task is done, or if any exceptions occurred during processing the task. | INFO | LoggingLevel
 | *restartDelay* (producer) | The delay in millis to use when restarting a route. | 1000 | int
 | *routeId* (producer) | To specify a route by its id. The special keyword current indicates the current route. |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -122,13 +132,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.controlbus.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.controlbus.enabled* | Whether to enable auto configuration of the controlbus component. This is enabled by default. |  | Boolean
 | *camel.component.controlbus.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-corda/src/main/docs/corda-component.adoc b/components/camel-corda/src/main/docs/corda-component.adoc
index b44cf29..effbc9e 100644
--- a/components/camel-corda/src/main/docs/corda-component.adoc
+++ b/components/camel-corda/src/main/docs/corda-component.adoc
@@ -30,7 +30,7 @@ corda://<host:port>[?options]
 
 
 // component options: START
-The corda component supports 2 options, which are listed below.
+The corda component supports 3 options, which are listed below.
 
 
 
@@ -39,6 +39,7 @@ The corda component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (common) | Default configuration |  | CordaConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -62,7 +63,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (4 parameters):
+==== Query Parameters (5 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -71,6 +72,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -90,13 +92,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 14 options, which are listed below.
+The component supports 15 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.corda.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.corda.configuration.arguments* |  |  | Object[]
 | *camel.component.corda.configuration.contract-state-class* |  |  | Class
 | *camel.component.corda.configuration.flow-loci-class* |  |  | Class
diff --git a/components/camel-couchbase/src/main/docs/couchbase-component.adoc b/components/camel-couchbase/src/main/docs/couchbase-component.adoc
index 4d2012c..0a75ae6 100644
--- a/components/camel-couchbase/src/main/docs/couchbase-component.adoc
+++ b/components/camel-couchbase/src/main/docs/couchbase-component.adoc
@@ -30,7 +30,16 @@ couchbase:url
 ### Options
 
 // component options: START
-The Couchbase component has no options.
+The Couchbase component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -54,7 +63,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (47 parameters):
+==== Query Parameters (48 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -83,6 +92,7 @@ with the following path and query parameters:
 | *replicateTo* (producer) | Where to replicate the data | 0 | int
 | *startingIdForInsertsFrom* (producer) | Define the starting Id where we are doing an insert operation |  | long
 | *additionalHosts* (advanced) | The additional hosts |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *maxReconnectDelay* (advanced) | Define the max delay during a reconnection | 30000 | long
 | *obsPollInterval* (advanced) | Define the observation polling interval | 400 | long
 | *obsTimeout* (advanced) | Define the observation timeout | -1 | long
@@ -125,13 +135,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.couchbase.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.couchbase.enabled* | Enable couchbase component | true | Boolean
 | *camel.component.couchbase.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-couchdb/src/main/docs/couchdb-component.adoc b/components/camel-couchdb/src/main/docs/couchdb-component.adoc
index b9b7e97..f0abc7a 100644
--- a/components/camel-couchdb/src/main/docs/couchdb-component.adoc
+++ b/components/camel-couchdb/src/main/docs/couchdb-component.adoc
@@ -45,7 +45,16 @@ is optional and if not specified then defaults to 5984.
 ### Options
 
 // component options: START
-The CouchDB component has no options.
+The CouchDB component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -70,7 +79,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (12 parameters):
+==== Query Parameters (13 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -85,6 +94,7 @@ with the following path and query parameters:
 | *updates* (consumer) | Document inserts/updates are published as events | true | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *password* (security) | Password for authenticated databases |  | String
 | *username* (security) | Username in case of authenticated databases |  | String
@@ -106,13 +116,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.couchdb.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.couchdb.enabled* | Enable couchdb component | true | Boolean
 | *camel.component.couchdb.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc b/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc
index 4c8106b..ed9ec82 100644
--- a/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc
+++ b/components/camel-crypto-cms/src/main/docs/crypto-cms-component.adoc
@@ -34,7 +34,7 @@ If the Bouncy Castle security provider is not registered then the Crypto CMS com
 ### Options
 
 // component options: START
-The Crypto CMS component supports 3 options, which are listed below.
+The Crypto CMS component supports 4 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The Crypto CMS component supports 3 options, which are listed below.
 | *signedDataVerifier Configuration* (advanced) | To configure the shared SignedDataVerifierConfiguration, which determines the uri parameters for the verify operation. |  | SignedDataVerifier Configuration
 | *envelopedDataDecryptor Configuration* (advanced) | To configure the shared EnvelopedDataDecryptorConfiguration, which determines the uri parameters for the decrypt operation. |  | EnvelopedDataDecryptor Configuration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -67,7 +68,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (15 parameters):
+==== Query Parameters (16 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -75,6 +76,7 @@ with the following path and query parameters:
 | Name | Description | Default | Type
 | *keyStore* (common) | Keystore which contains signer private keys, verifier public keys, encryptor public keys, decryptor private keys depending on the operation. Use either this parameter or the parameter 'keyStoreParameters'. |  | KeyStore
 | *keyStoreParameters* (common) | Keystore containing signer private keys, verifier public keys, encryptor public keys, decryptor private keys depending on the operation. Use either this parameter or the parameter 'keystore'. |  | KeyStoreParameters
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *password* (decrypt) | Sets the password of the private keys. It is assumed that all private keys in the keystore have the same password. If not set then it is assumed that the password of the private keys is given by the keystore password given in the KeyStoreParameters. |  | Char[]
 | *fromBase64* (decrypt_verify) | If true then the CMS message is base 64 encoded and must be decoded during the processing. Default value is false. | false | Boolean
@@ -106,13 +108,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.crypto-cms.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.crypto-cms.enabled* | Whether to enable auto configuration of the crypto-cms component. This is enabled by default. |  | Boolean
 | *camel.component.crypto-cms.enveloped-data-decryptor-configuration* | To configure the shared EnvelopedDataDecryptorConfiguration, which determines the uri parameters for the decrypt operation. The option is a org.apache.camel.component.crypto.cms.crypt.EnvelopedDataDecryptorConfiguration type. |  | String
 | *camel.component.crypto-cms.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-crypto/src/main/docs/crypto-component.adoc b/components/camel-crypto/src/main/docs/crypto-component.adoc
index ff8e1a8..d7e79eb 100644
--- a/components/camel-crypto/src/main/docs/crypto-component.adoc
+++ b/components/camel-crypto/src/main/docs/crypto-component.adoc
@@ -81,7 +81,7 @@ both signing and verifying should be configured identically.
 ### Options
 
 // component options: START
-The Crypto (JCE) component supports 2 options, which are listed below.
+The Crypto (JCE) component supports 3 options, which are listed below.
 
 
 
@@ -90,6 +90,7 @@ The Crypto (JCE) component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (advanced) | To use the shared DigitalSignatureConfiguration as configuration |  | DigitalSignature Configuration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -113,7 +114,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (19 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -130,6 +131,7 @@ with the following path and query parameters:
 | *publicKeyName* (producer) | references that should be resolved when the context changes |  | String
 | *secureRandomName* (producer) | Sets the reference name for a SecureRandom that can be found in the registry. |  | String
 | *signatureHeaderName* (producer) | Set the name of the message header that should be used to store the base64 encoded signature. This defaults to 'CamelDigitalSignature' |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *bufferSize* (advanced) | Set the size of the buffer used to read in the Exchange payload data. | 2048 | Integer
 | *certificate* (advanced) | Set the Certificate that should be used to verify the signature in the exchange based on its payload. |  | Certificate
 | *clearHeaders* (advanced) | Determines if the Signature specific headers be cleared after signing and verification. Defaults to true, and should only be made otherwise at your extreme peril as vital private information such as Keys and passwords may escape if unset. | true | boolean
@@ -156,13 +158,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 33 options, which are listed below.
+The component supports 34 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.crypto.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.crypto.configuration.algorithm* | Sets the JCE name of the Algorithm that should be used for the signer. | SHA1WithDSA | String
 | *camel.component.crypto.configuration.alias* | Sets the alias used to query the KeyStore for keys and {@link java.security.cert.Certificate Certificates} to be used in signing and verifying exchanges. This value can be provided at runtime via the message header {@link org.apache.camel.component.crypto.DigitalSignatureConstants#KEYSTORE_ALIAS} |  | String
 | *camel.component.crypto.configuration.buffer-size* | Set the size of the buffer used to read in the Exchange payload data. | 2048 | Integer
diff --git a/components/camel-crypto/src/main/docs/crypto-dataformat.adoc b/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
index 72b0d02..46bb009 100644
--- a/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
+++ b/components/camel-crypto/src/main/docs/crypto-dataformat.adoc
@@ -49,13 +49,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 33 options, which are listed below.
+The component supports 34 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.crypto.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.crypto.configuration.algorithm* | Sets the JCE name of the Algorithm that should be used for the signer. | SHA1WithDSA | String
 | *camel.component.crypto.configuration.alias* | Sets the alias used to query the KeyStore for keys and {@link java.security.cert.Certificate Certificates} to be used in signing and verifying exchanges. This value can be provided at runtime via the message header {@link org.apache.camel.component.crypto.DigitalSignatureConstants#KEYSTORE_ALIAS} |  | String
 | *camel.component.crypto.configuration.buffer-size* | Set the size of the buffer used to read in the Exchange payload data. | 2048 | Integer
diff --git a/components/camel-cxf/src/main/docs/cxf-component.adoc b/components/camel-cxf/src/main/docs/cxf-component.adoc
index 6482094..d504329 100644
--- a/components/camel-cxf/src/main/docs/cxf-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxf-component.adoc
@@ -109,7 +109,7 @@ cxf:bean:cxfEndpoint?wsdlURL=wsdl/hello_world.wsdl&dataFormat=PAYLOAD
 
 
 // component options: START
-The CXF component supports 4 options, which are listed below.
+The CXF component supports 5 options, which are listed below.
 
 
 
@@ -120,6 +120,7 @@ The CXF component supports 4 options, which are listed below.
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -147,7 +148,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (34 parameters):
+==== Query Parameters (35 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -165,6 +166,7 @@ with the following path and query parameters:
 | *sslContextParameters* (producer) | The Camel SSL setting reference. Use the # notation to reference the SSL Context. |  | SSLContextParameters
 | *wrapped* (producer) | Which kind of operation that CXF endpoint producer will invoke | false | boolean
 | *allowStreaming* (advanced) | This option controls whether the CXF component, when running in PAYLOAD mode, will DOM parse the incoming messages into DOM Elements or keep the payload as a javax.xml.transform.Source object that would allow streaming in some cases. |  | Boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *bus* (advanced) | To use a custom configured CXF Bus. |  | Bus
 | *continuationTimeout* (advanced) | This option is used to set the CXF continuation timeout which could be used in CxfConsumer by default when the CXF server is using Jetty or Servlet transport. | 30000 | long
 | *cxfBinding* (advanced) | To use a custom CxfBinding to control the binding between Camel Message and CXF Message. |  | CxfBinding
@@ -205,7 +207,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
 
 
 
@@ -213,6 +215,7 @@ The component supports 5 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.cxf.allow-streaming* | This option controls whether the CXF component, when running in PAYLOAD mode, will DOM parse the incoming messages into DOM Elements or keep the payload as a javax.xml.transform.Source object that would allow streaming in some cases. |  | Boolean
+| *camel.component.cxf.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.cxf.enabled* | Enable cxf component | true | Boolean
 | *camel.component.cxf.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. |  | String
 | *camel.component.cxf.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-cxf/src/main/docs/cxfrs-component.adoc b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
index 9e5b852..e464397 100644
--- a/components/camel-cxf/src/main/docs/cxfrs-component.adoc
+++ b/components/camel-cxf/src/main/docs/cxfrs-component.adoc
@@ -55,7 +55,7 @@ cxfrs:bean:cxfEndpoint?resourceClasses=org.apache.camel.rs.Example
 
 
 // component options: START
-The CXF-RS component supports 3 options, which are listed below.
+The CXF-RS component supports 4 options, which are listed below.
 
 
 
@@ -65,6 +65,7 @@ The CXF-RS component supports 3 options, which are listed below.
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -91,7 +92,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (30 parameters):
+==== Query Parameters (31 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -118,6 +119,7 @@ with the following path and query parameters:
 | *httpClientAPI* (producer) | If it is true, the CxfRsProducer will use the HttpClientAPI to invoke the service. If it is false, the CxfRsProducer will use the ProxyClientAPI to invoke the service | true | boolean
 | *ignoreDeleteMethodMessage Body* (producer) | This option is used to tell CxfRsProducer to ignore the message body of the DELETE method when using HTTP API. | false | boolean
 | *maxClientCacheSize* (producer) | This option allows you to configure the maximum size of the cache. The implementation caches CXF clients or ClientFactoryBean in CxfProvider and CxfRsProvider. | 10 | int
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *binding* (advanced) | To use a custom CxfBinding to control the binding between Camel Message and CXF Message. |  | CxfRsBinding
 | *bus* (advanced) | To use a custom configured CXF Bus. |  | Bus
 | *continuationTimeout* (advanced) | This option is used to set the CXF continuation timeout which could be used in CxfConsumer by default when the CXF server is using Jetty or Servlet transport. | 30000 | long
@@ -145,13 +147,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.cxfrs.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.cxfrs.enabled* | Enable cxfrs component | true | Boolean
 | *camel.component.cxfrs.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. |  | String
 | *camel.component.cxfrs.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-dataformat/src/main/docs/dataformat-component.adoc b/components/camel-dataformat/src/main/docs/dataformat-component.adoc
index 19d803b..15b1609 100644
--- a/components/camel-dataformat/src/main/docs/dataformat-component.adoc
+++ b/components/camel-dataformat/src/main/docs/dataformat-component.adoc
@@ -23,7 +23,16 @@ for which options it support.
 
 
 // component options: START
-The Data Format component has no options.
+The Data Format component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -48,12 +57,13 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (1 parameters):
+==== Query Parameters (2 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -74,13 +84,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.dataformat.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.dataformat.enabled* | Whether to enable auto configuration of the dataformat component. This is enabled by default. |  | Boolean
 | *camel.component.dataformat.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-dataset/src/main/docs/dataset-component.adoc b/components/camel-dataset/src/main/docs/dataset-component.adoc
index 4d12d6f..a0c2eff 100644
--- a/components/camel-dataset/src/main/docs/dataset-component.adoc
+++ b/components/camel-dataset/src/main/docs/dataset-component.adoc
@@ -45,7 +45,16 @@ extend `DataSetSupport`.
 
 
 // component options: START
-The Dataset component has no options.
+The Dataset component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -69,7 +78,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -90,6 +99,7 @@ with the following path and query parameters:
 | *retainLast* (producer) | Specifies to only retain the last n'th number of received Exchanges. This is used when testing with big data, to reduce memory consumption by not storing copies of every Exchange this mock endpoint receives. Important: When using this limitation, then the getReceivedCounter() will still return the actual number of received Exchanges. For example if we have received 5000 Exchanges, and have configured to only retain the last 20 Exchanges, then the getReceivedCo [...]
 | *sleepForEmptyTest* (producer) | Allows a sleep to be specified to wait to check that this endpoint really is empty when expectedMessageCount(int) is called with zero | 0 | long
 | *copyOnExchange* (producer) | Sets whether to make a deep copy of the incoming Exchange when received at this mock endpoint. Is by default true. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -109,13 +119,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.dataset.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.dataset.enabled* | Whether to enable auto configuration of the dataset component. This is enabled by default. |  | Boolean
 | *camel.component.dataset.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-dataset/src/main/docs/dataset-test-component.adoc b/components/camel-dataset/src/main/docs/dataset-test-component.adoc
index d4bf677..4921884 100644
--- a/components/camel-dataset/src/main/docs/dataset-test-component.adoc
+++ b/components/camel-dataset/src/main/docs/dataset-test-component.adoc
@@ -56,7 +56,16 @@ pulled from before starting the test.
 === URI Options
 
 // component options: START
-The DataSet Test component has no options.
+The DataSet Test component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -79,7 +88,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (14 parameters):
+==== Query Parameters (15 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +107,7 @@ with the following path and query parameters:
 | *retainLast* (producer) | Specifies to only retain the last n'th number of received Exchanges. This is used when testing with big data, to reduce memory consumption by not storing copies of every Exchange this mock endpoint receives. Important: When using this limitation, then the getReceivedCounter() will still return the actual number of received Exchanges. For example if we have received 5000 Exchanges, and have configured to only retain the last 20 Exchanges, then the getReceivedCo [...]
 | *sleepForEmptyTest* (producer) | Allows a sleep to be specified to wait to check that this endpoint really is empty when expectedMessageCount(int) is called with zero | 0 | long
 | *copyOnExchange* (producer) | Sets whether to make a deep copy of the incoming Exchange when received at this mock endpoint. Is by default true. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -117,13 +127,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.dataset-test.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.dataset-test.enabled* | Whether to enable auto configuration of the dataset-test component. This is enabled by default. |  | Boolean
 | *camel.component.dataset-test.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
@@ -149,4 +160,4 @@ To see how you can set other expectations on the test endpoint, see the
 
 === See Also
 
-* Spring Testing
\ No newline at end of file
+* Spring Testing
diff --git a/components/camel-digitalocean/src/main/docs/digitalocean-component.adoc b/components/camel-digitalocean/src/main/docs/digitalocean-component.adoc
index a6e0f02..4e948c3 100644
--- a/components/camel-digitalocean/src/main/docs/digitalocean-component.adoc
+++ b/components/camel-digitalocean/src/main/docs/digitalocean-component.adoc
@@ -31,7 +31,16 @@ The DigitalOcean component only supports producer endpoints so you cannot use th
 
 
 // component options: START
-The DigitalOcean component has no options.
+The DigitalOcean component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -53,7 +62,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (10 parameters):
+==== Query Parameters (11 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -62,6 +71,7 @@ with the following path and query parameters:
 | *page* (producer) | Use for pagination. Force the page number. | 1 | Integer
 | *perPage* (producer) | Use for pagination. Set the number of item per request. The maximum number of results per page is 200. | 25 | Integer
 | *resource* (producer) | *Required* The DigitalOcean resource type on which perform the operation. |  | DigitalOceanResources
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *digitalOceanClient* (advanced) | To use a existing configured DigitalOceanClient as client |  | DigitalOceanClient
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *httpProxyHost* (proxy) | Set a proxy host if needed |  | String
@@ -87,13 +97,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.digitalocean.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.digitalocean.enabled* | Enable digitalocean component | true | Boolean
 | *camel.component.digitalocean.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-direct/src/main/docs/direct-component.adoc b/components/camel-direct/src/main/docs/direct-component.adoc
index 162e83d..364ebc4 100644
--- a/components/camel-direct/src/main/docs/direct-component.adoc
+++ b/components/camel-direct/src/main/docs/direct-component.adoc
@@ -30,7 +30,7 @@ Where *someName* can be any string to uniquely identify the endpoint
 
 
 // component options: START
-The Direct component supports 3 options, which are listed below.
+The Direct component supports 4 options, which are listed below.
 
 
 
@@ -40,6 +40,7 @@ The Direct component supports 3 options, which are listed below.
 | *block* (producer) | If sending a message to a direct endpoint which has no active consumer, then we can tell the producer to block and wait for the consumer to become active. | true | boolean
 | *timeout* (producer) | The timeout value to use if block is enabled. | 30000 | long
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -65,7 +66,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (7 parameters):
+==== Query Parameters (8 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -77,6 +78,7 @@ with the following path and query parameters:
 | *block* (producer) | If sending a message to a direct endpoint which has no active consumer, then we can tell the producer to block and wait for the consumer to become active. | true | boolean
 | *failIfNoConsumers* (producer) | Whether the producer should fail by throwing an exception, when sending to a DIRECT endpoint with no active consumers. | false | boolean
 | *timeout* (producer) | The timeout value to use if block is enabled. | 30000 | long
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -97,13 +99,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.direct.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.direct.block* | If sending a message to a direct endpoint which has no active consumer, then we can tell the producer to block and wait for the consumer to become active. | true | Boolean
 | *camel.component.direct.enabled* | Whether to enable auto configuration of the direct component. This is enabled by default. |  | Boolean
 | *camel.component.direct.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-directvm/src/main/docs/direct-vm-component.adoc b/components/camel-directvm/src/main/docs/direct-vm-component.adoc
index e5dbac6..6bb3389 100644
--- a/components/camel-directvm/src/main/docs/direct-vm-component.adoc
+++ b/components/camel-directvm/src/main/docs/direct-vm-component.adoc
@@ -41,7 +41,7 @@ Where *someName* can be any string to uniquely identify the endpoint
 
 
 // component options: START
-The Direct VM component supports 5 options, which are listed below.
+The Direct VM component supports 6 options, which are listed below.
 
 
 
@@ -53,6 +53,7 @@ The Direct VM component supports 5 options, which are listed below.
 | *headerFilterStrategy* (advanced) | Sets a HeaderFilterStrategy that will only be applied on producer endpoints (on both directions: request and response). Default value: none. |  | HeaderFilterStrategy
 | *propagateProperties* (advanced) | Whether to propagate or not properties from the producer side to the consumer side, and vice versa. Default value: true. | true | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -78,7 +79,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (9 parameters):
+==== Query Parameters (10 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,6 +92,7 @@ with the following path and query parameters:
 | *failIfNoConsumers* (producer) | Whether the producer should fail by throwing an exception, when sending to a Direct-VM endpoint with no active consumers. | false | boolean
 | *timeout* (producer) | The timeout value to use if block is enabled. | 30000 | long
 | *headerFilterStrategy* (producer) | Sets a HeaderFilterStrategy that will only be applied on producer endpoints (on both directions: request and response). Default value: none. |  | HeaderFilterStrategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *propagateProperties* (advanced) | Whether to propagate or not properties from the producer side to the consumer side, and vice versa. Default value: true. | true | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
diff --git a/components/camel-disruptor/src/main/docs/disruptor-component.adoc b/components/camel-disruptor/src/main/docs/disruptor-component.adoc
index 8e1d0ab..3a8aeab 100644
--- a/components/camel-disruptor/src/main/docs/disruptor-component.adoc
+++ b/components/camel-disruptor/src/main/docs/disruptor-component.adoc
@@ -95,7 +95,7 @@ All the following options are valid for both the **disruptor:** and
 
 
 // component options: START
-The Disruptor component supports 8 options, which are listed below.
+The Disruptor component supports 9 options, which are listed below.
 
 
 
@@ -110,6 +110,7 @@ The Disruptor component supports 8 options, which are listed below.
 | *queueSize* (common) | *Deprecated* To configure the ring buffer size |  | int
 | *bufferSize* (common) | To configure the ring buffer size | 1024 | int
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -135,7 +136,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (12 parameters):
+==== Query Parameters (13 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -152,6 +153,7 @@ with the following path and query parameters:
 | *producerType* (producer) | Defines the producers allowed on the Disruptor. The options allowed are: Multi to allow multiple producers and Single to enable certain optimizations only allowed when one concurrent producer (on one thread or otherwise synchronized) is active. | Multi | DisruptorProducerType
 | *timeout* (producer) | Timeout (in milliseconds) before a producer will stop waiting for an asynchronous task to complete. You can disable timeout by using 0 or a negative value. | 30000 | long
 | *waitForTaskToComplete* (producer) | Option to specify whether the caller should wait for the async task to complete or not before continuing. The following three options are supported: Always, Never or IfReplyExpected. The first two values are self-explanatory. The last value, IfReplyExpected, will only wait if the message is Request Reply based. | IfReplyExpected | WaitForTaskToComplete
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -171,13 +173,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 18 options, which are listed below.
+The component supports 20 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.disruptor-vm.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.disruptor-vm.buffer-size* | To configure the ring buffer size | 1024 | Integer
 | *camel.component.disruptor-vm.default-block-when-full* | To configure the default value for block when full The default value is true. | true | Boolean
 | *camel.component.disruptor-vm.default-concurrent-consumers* | To configure the default number of concurrent consumers | 1 | Integer
@@ -186,6 +189,7 @@ The component supports 18 options, which are listed below.
 | *camel.component.disruptor-vm.default-wait-strategy* | To configure the default value for DisruptorWaitStrategy The default value is Blocking. |  | DisruptorWaitStrategy
 | *camel.component.disruptor-vm.enabled* | Enable disruptor-vm component | true | Boolean
 | *camel.component.disruptor-vm.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
+| *camel.component.disruptor.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.disruptor.buffer-size* | To configure the ring buffer size | 1024 | Integer
 | *camel.component.disruptor.default-block-when-full* | To configure the default value for block when full The default value is true. | true | Boolean
 | *camel.component.disruptor.default-concurrent-consumers* | To configure the default number of concurrent consumers | 1 | Integer
diff --git a/components/camel-dns/src/main/docs/dns-component.adoc b/components/camel-dns/src/main/docs/dns-component.adoc
index 902a748..0984e36 100644
--- a/components/camel-dns/src/main/docs/dns-component.adoc
+++ b/components/camel-dns/src/main/docs/dns-component.adoc
@@ -51,7 +51,16 @@ This component only supports producers.
 
 
 // component options: START
-The DNS component has no options.
+The DNS component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -75,12 +84,13 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (1 parameters):
+==== Query Parameters (2 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -100,13 +110,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.dns.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.dns.enabled* | Enable dns component | true | Boolean
 | *camel.component.dns.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-docker/src/main/docs/docker-component.adoc b/components/camel-docker/src/main/docs/docker-component.adoc
index dc3b283..7a6bc57 100644
--- a/components/camel-docker/src/main/docs/docker-component.adoc
+++ b/components/camel-docker/src/main/docs/docker-component.adoc
@@ -23,7 +23,7 @@ Where *operation* is the specific action to perform on Docker.
 ### General Options
 
 // component options: START
-The Docker component supports 2 options, which are listed below.
+The Docker component supports 3 options, which are listed below.
 
 
 
@@ -32,6 +32,7 @@ The Docker component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (advanced) | To use the shared docker configuration |  | DockerConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -55,7 +56,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -68,6 +69,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *cmdExecFactory* (advanced) | The fully qualified class name of the DockerCmdExecFactory implementation to use | com.github.dockerjava.netty.NettyDockerCmdExecFactory | String
 | *followRedirectFilter* (advanced) | Whether to follow redirect filter | false | boolean
 | *loggingFilter* (advanced) | Whether to use logging filter | false | boolean
@@ -99,13 +101,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 20 options, which are listed below.
+The component supports 21 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.docker.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.docker.configuration.cert-path* | Location containing the SSL certificate chain |  | String
 | *camel.component.docker.configuration.cmd-exec-factory* | The fully qualified class name of the DockerCmdExecFactory implementation to use | com.github.dockerjava.netty.NettyDockerCmdExecFactory | String
 | *camel.component.docker.configuration.email* | Email address associated with the user |  | String
diff --git a/components/camel-dozer/src/main/docs/dozer-component.adoc b/components/camel-dozer/src/main/docs/dozer-component.adoc
index b7279d9..5b379b0 100644
--- a/components/camel-dozer/src/main/docs/dozer-component.adoc
+++ b/components/camel-dozer/src/main/docs/dozer-component.adoc
@@ -57,7 +57,16 @@ from("direct:orderInput").
 ### Options
 
 // component options: START
-The Dozer component has no options.
+The Dozer component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -79,7 +88,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (7 parameters):
+==== Query Parameters (8 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,6 +100,7 @@ with the following path and query parameters:
 | *sourceModel* (producer) | Fully-qualified class name for the source type used in the mapping. If specified, the input to the mapping is converted to the specified type before being mapped with Dozer. |  | String
 | *targetModel* (producer) | *Required* Fully-qualified class name for the target type used in the mapping. |  | String
 | *unmarshalId* (producer) | The id of a dataFormat defined within the Camel Context to use for unmarshalling the mapping input from a non-Java type. |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -110,13 +120,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.dozer.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.dozer.enabled* | Enable dozer component | true | Boolean
 | *camel.component.dozer.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-drill/src/main/docs/drill-component.adoc b/components/camel-drill/src/main/docs/drill-component.adoc
index a563ece..81f6054 100644
--- a/components/camel-drill/src/main/docs/drill-component.adoc
+++ b/components/camel-drill/src/main/docs/drill-component.adoc
@@ -37,7 +37,16 @@ The producer execute query using *CamelDrillQuery* header and put results into b
 ### Options
 
 // component options: START
-The Drill component has no options.
+The Drill component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -61,7 +70,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (5 parameters):
+==== Query Parameters (6 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -71,6 +80,7 @@ with the following path and query parameters:
 | *directory* (producer) | Drill directory in ZooKeeper |  | String
 | *mode* (producer) | Connection mode: zk: Zookeeper drillbit: Drillbit direct connection https://drill.apache.org/docs/using-the-jdbc-driver/ | ZK | DrillConnectionMode
 | *port* (producer) | ZooKeeper port number |  | Integer
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -90,13 +100,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.drill.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.drill.enabled* | Enable drill component | true | Boolean
 | *camel.component.drill.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-dropbox/src/main/docs/dropbox-component.adoc b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
index 0c4c7ee..0ddc4da 100644
--- a/components/camel-dropbox/src/main/docs/dropbox-component.adoc
+++ b/components/camel-dropbox/src/main/docs/dropbox-component.adoc
@@ -66,7 +66,16 @@ https://www.dropbox.com/developers/core/start/java[Dropbox
 documentation] that explains how to get them.  
 
 // component options: START
-The Dropbox component has no options.
+The Dropbox component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -88,7 +97,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (12 parameters):
+==== Query Parameters (13 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -105,6 +114,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -124,13 +134,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.dropbox.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.dropbox.enabled* | Enable dropbox component | true | Boolean
 | *camel.component.dropbox.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-ehcache/src/main/docs/ehcache-component.adoc b/components/camel-ehcache/src/main/docs/ehcache-component.adoc
index 189af6d..b6feb71 100644
--- a/components/camel-ehcache/src/main/docs/ehcache-component.adoc
+++ b/components/camel-ehcache/src/main/docs/ehcache-component.adoc
@@ -38,7 +38,7 @@ format, `?option=value&option=#beanRef&...`
 
 
 // component options: START
-The Ehcache component supports 7 options, which are listed below.
+The Ehcache component supports 8 options, which are listed below.
 
 
 
@@ -52,6 +52,7 @@ The Ehcache component supports 7 options, which are listed below.
 | *cachesConfigurations* (common) | A map of caches configurations to be used to create caches. |  | Map
 | *cacheConfigurationUri* (common) | URI pointing to the Ehcache XML configuration file's location |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -76,7 +77,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (17 parameters):
+==== Query Parameters (18 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -94,6 +95,7 @@ with the following path and query parameters:
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *action* (producer) | To configure the default cache action. If an action is set in the message header, then the operation from the header takes precedence. |  | String
 | *key* (producer) | To configure the default action key. If a key is set in the message header, then the key from the header takes precedence. |  | Object
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *configuration* (advanced) | The default cache configuration to be used to create caches. |  | CacheConfiguration
 | *configurations* (advanced) | A map of cache configuration to be used to create caches. |  | Map
 | *keyType* (advanced) | The cache key type, default java.lang.Object | java.lang.Object | String
@@ -117,13 +119,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 25 options, which are listed below.
+The component supports 26 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ehcache.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ehcache.cache-configuration* | The default cache configuration to be used to create caches. The option is a org.ehcache.config.CacheConfiguration<?,?> type. |  | String
 | *camel.component.ehcache.cache-configuration-uri* | URI pointing to the Ehcache XML configuration file's location |  | String
 | *camel.component.ehcache.cache-manager* | The cache manager. The option is a org.ehcache.CacheManager type. |  | String
diff --git a/components/camel-ejb/src/main/docs/ejb-component.adoc b/components/camel-ejb/src/main/docs/ejb-component.adoc
index 77694e1..027be1d 100644
--- a/components/camel-ejb/src/main/docs/ejb-component.adoc
+++ b/components/camel-ejb/src/main/docs/ejb-component.adoc
@@ -33,7 +33,7 @@ the Application Server JNDI Registry
 
 
 // component options: START
-The EJB component supports 4 options, which are listed below.
+The EJB component supports 5 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The EJB component supports 4 options, which are listed below.
 | *properties* (producer) | Properties for creating javax.naming.Context if a context has not been configured. |  | Properties
 | *cache* (advanced) | If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. |  | Boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -69,13 +70,14 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (4 parameters):
+==== Query Parameters (5 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *method* (producer) | Sets the name of the method to invoke on the bean |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *cache* (advanced) | If enabled, Camel will cache the result of the first Registry look-up. Cache can be enabled if the bean in the Registry is defined as a singleton scope. |  | Boolean
 | *parameters* (advanced) | Used for configuring additional properties on the bean |  | Map
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
diff --git a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
index 93fa2fa..97bc198 100644
--- a/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
+++ b/components/camel-elasticsearch-rest/src/main/docs/elasticsearch-rest-component.adoc
@@ -31,7 +31,7 @@ elasticsearch-rest://clusterName[?options]
 === Endpoint Options
 
 // component options: START
-The Elastichsearch Rest component supports 12 options, which are listed below.
+The Elastichsearch Rest component supports 13 options, which are listed below.
 
 
 
@@ -50,6 +50,7 @@ The Elastichsearch Rest component supports 12 options, which are listed below.
 | *snifferInterval* (advanced) | The interval between consecutive ordinary sniff executions in milliseconds. Will be honoured when sniffOnFailure is disabled or when there are no failures between consecutive sniff executions | 300000 | int
 | *sniffAfterFailureDelay* (advanced) | The delay of a sniff execution scheduled after a failure (in milliseconds) | 60000 | int
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -73,7 +74,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,6 +92,7 @@ with the following path and query parameters:
 | *socketTimeout* (producer) | The timeout in ms to wait before the socket will timeout. | 30000 | int
 | *useScroll* (producer) | Enable scroll usage | false | boolean
 | *waitForActiveShards* (producer) | Index creation waits for the write consistency number of shards to be available | 1 | int
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -110,13 +112,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 13 options, which are listed below.
+The component supports 14 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.elasticsearch-rest.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.elasticsearch-rest.client* | To use an existing configured Elasticsearch client, instead of creating a client per endpoint. This allow to customize the client with specific settings. The option is a org.elasticsearch.client.RestClient type. |  | String
 | *camel.component.elasticsearch-rest.connection-timeout* | The time in ms to wait before connection will timeout. | 30000 | Integer
 | *camel.component.elasticsearch-rest.enable-s-s-l* | Enable SSL | false | Boolean
diff --git a/components/camel-elsql/src/main/docs/elsql-component.adoc b/components/camel-elsql/src/main/docs/elsql-component.adoc
index 425e74f..6e79c48 100644
--- a/components/camel-elsql/src/main/docs/elsql-component.adoc
+++ b/components/camel-elsql/src/main/docs/elsql-component.adoc
@@ -50,7 +50,7 @@ If a named parameter cannot be resolved, then an exception is thrown.
 === Options
 
 // component options: START
-The ElSQL component supports 5 options, which are listed below.
+The ElSQL component supports 6 options, which are listed below.
 
 
 
@@ -62,6 +62,7 @@ The ElSQL component supports 5 options, which are listed below.
 | *elSqlConfig* (advanced) | To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead. |  | ElSqlConfig
 | *resourceUri* (common) | The resource file which contains the elsql SQL statements to use. You can specify multiple resources separated by comma. The resources are loaded on the classpath by default, you can prefix with file: to load from file system. Notice you can set this option on the component and then you do not have to configure this on the endpoint. |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -85,7 +86,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (47 parameters):
+==== Query Parameters (48 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -118,6 +119,7 @@ with the following path and query parameters:
 | *noop* (producer) | If set, will ignore the results of the SQL query and use the existing IN message as the OUT message for the continuation of processing | false | boolean
 | *useMessageBodyForSql* (producer) | Whether to use the message body as the SQL and then headers for parameters. If this option is enabled then the SQL in the uri is not used. | false | boolean
 | *alwaysPopulateStatement* (advanced) | If enabled then the populateStatement method from org.apache.camel.component.sql.SqlPrepareStatementStrategy is always invoked, also if there is no expected parameters to be prepared. When this is false then the populateStatement is only invoked if there is 1 or more expected parameters to be set; for example this avoids reading the message body/headers for SQL queries with no parameters. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *elSqlConfig* (advanced) | To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead. |  | ElSqlConfig
 | *parametersCount* (advanced) | If set greater than zero, then Camel will use this count value of parameters to replace instead of querying via JDBC metadata API. This is useful if the JDBC vendor could not return correct parameters count, then user may override instead. |  | int
 | *placeholder* (advanced) | Specifies a character that will be replaced to in SQL query. Notice, that it is simple String.replaceAll() operation and no SQL parsing is involved (quoted strings will also change). | # | String
@@ -156,13 +158,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.elsql.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.elsql.data-source* | Sets the DataSource to use to communicate with the database. The option is a javax.sql.DataSource type. |  | String
 | *camel.component.elsql.database-vendor* | To use a vendor specific com.opengamma.elsql.ElSqlConfig |  | ElSqlDatabaseVendor
 | *camel.component.elsql.el-sql-config* | To use a specific configured ElSqlConfig. It may be better to use the databaseVendor option instead. The option is a com.opengamma.elsql.ElSqlConfig type. |  | String
diff --git a/components/camel-etcd/src/main/docs/etcd-component.adoc b/components/camel-etcd/src/main/docs/etcd-component.adoc
index b07c557..27d47ba 100644
--- a/components/camel-etcd/src/main/docs/etcd-component.adoc
+++ b/components/camel-etcd/src/main/docs/etcd-component.adoc
@@ -15,7 +15,7 @@ etcd:namespace/path[?options]
 ### URI Options
 
 // component options: START
-The etcd component supports 7 options, which are listed below.
+The etcd component supports 8 options, which are listed below.
 
 
 
@@ -29,6 +29,7 @@ The etcd component supports 7 options, which are listed below.
 | *configuration* (advanced) | Sets the common configuration shared among endpoints |  | EtcdConfiguration
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -52,7 +53,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (29 parameters):
+==== Query Parameters (30 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -70,6 +71,7 @@ with the following path and query parameters:
 | *fromIndex* (consumer) | The index to watch from | 0 | Long
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
 | *timeToLive* (producer) | To set the lifespan of a key in milliseconds. |  | Integer
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -105,13 +107,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 17 options, which are listed below.
+The component supports 18 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.etcd.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.etcd.configuration.from-index* | The index to watch from | 0 | Long
 | *camel.component.etcd.configuration.password* | The password to use for basic authentication. |  | String
 | *camel.component.etcd.configuration.recursive* | To apply an action recursively. | false | Boolean
diff --git a/components/camel-eventadmin/src/main/docs/eventadmin-component.adoc b/components/camel-eventadmin/src/main/docs/eventadmin-component.adoc
index 355a47e..d145b66 100644
--- a/components/camel-eventadmin/src/main/docs/eventadmin-component.adoc
+++ b/components/camel-eventadmin/src/main/docs/eventadmin-component.adoc
@@ -34,7 +34,7 @@ where `topic` is the name of the topic to listen too.
 ### URI options
 
 // component options: START
-The OSGi EventAdmin component supports 2 options, which are listed below.
+The OSGi EventAdmin component supports 3 options, which are listed below.
 
 
 
@@ -43,6 +43,7 @@ The OSGi EventAdmin component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *bundleContext* (common) | The OSGi BundleContext is automatic injected by Camel |  | BundleContext
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -65,7 +66,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (5 parameters):
+==== Query Parameters (6 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -75,6 +76,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
diff --git a/components/camel-exec/src/main/docs/exec-component.adoc b/components/camel-exec/src/main/docs/exec-component.adoc
index e1f6e6b..b773ca6 100644
--- a/components/camel-exec/src/main/docs/exec-component.adoc
+++ b/components/camel-exec/src/main/docs/exec-component.adoc
@@ -35,7 +35,16 @@ executable must in the system path.
 ### URI options
 
 // component options: START
-The Exec component has no options.
+The Exec component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -57,7 +66,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -70,6 +79,7 @@ with the following path and query parameters:
 | *timeout* (producer) | The timeout, in milliseconds, after which the executable should be terminated. If execution has not completed within the timeout, the component will send a termination request. |  | long
 | *useStderrOnEmptyStdout* (producer) | A boolean indicating that when stdout is empty, this component will populate the Camel Message Body with stderr. This behavior is disabled (false) by default. | false | boolean
 | *workingDir* (producer) | The directory in which the command should be executed. If null, the working directory of the current process will be used. |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -89,13 +99,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.exec.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.exec.enabled* | Enable exec component | true | Boolean
 | *camel.component.exec.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-facebook/src/main/docs/facebook-component.adoc b/components/camel-facebook/src/main/docs/facebook-component.adoc
index 0667e46..7ca4581 100644
--- a/components/camel-facebook/src/main/docs/facebook-component.adoc
+++ b/components/camel-facebook/src/main/docs/facebook-component.adoc
@@ -53,7 +53,7 @@ to application APIs.
 
 
 // component options: START
-The Facebook component supports 2 options, which are listed below.
+The Facebook component supports 3 options, which are listed below.
 
 
 
@@ -62,6 +62,7 @@ The Facebook component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (advanced) | To use the shared configuration |  | FacebookConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -88,7 +89,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (102 parameters):
+==== Query Parameters (103 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -185,6 +186,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *httpProxyHost* (proxy) | HTTP proxy server host name |  | String
 | *httpProxyPassword* (proxy) | HTTP proxy server password |  | String
@@ -214,13 +216,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 29 options, which are listed below.
+The component supports 30 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.facebook.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.facebook.configuration.client-u-r-l* | Facebook4J API client URL |  | String
 | *camel.component.facebook.configuration.client-version* | Facebook4J client API version |  | String
 | *camel.component.facebook.configuration.debug-enabled* | Enables deubg output. Effective only with the embedded logger | false | Boolean
diff --git a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
index 99dd257..53d3091 100644
--- a/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
+++ b/components/camel-fhir/camel-fhir-component/src/main/docs/fhir-component.adoc
@@ -47,7 +47,7 @@ Endpoint prefix can be one of:
 
 
 // component options: START
-The FHIR component supports 2 options, which are listed below.
+The FHIR component supports 3 options, which are listed below.
 
 
 
@@ -56,6 +56,7 @@ The FHIR component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (common) | To use the shared configuration |  | FhirConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -80,7 +81,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (26 parameters):
+==== Query Parameters (27 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -95,6 +96,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *compress* (advanced) | Compresses outgoing (POST/PUT) contents to the GZIP format | false | boolean
 | *connectionTimeout* (advanced) | How long to try and establish the initial TCP connection (in ms) | 10000 | Integer
 | *deferModelScanning* (advanced) | When this option is set, model classes will not be scanned for children until the child list for the given type is actually accessed. | false | boolean
@@ -130,13 +132,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 27 options, which are listed below.
+The component supports 28 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.fhir.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.fhir.configuration.access-token* | What sub operation to use for the selected operation |  | String
 | *camel.component.fhir.configuration.api-name* | What kind of operation to perform |  | FhirApiName
 | *camel.component.fhir.configuration.client* | What sub operation to use for the selected operation |  | IGenericClient
diff --git a/components/camel-file/src/main/docs/file-component.adoc b/components/camel-file/src/main/docs/file-component.adoc
index 432b850..e822f50 100644
--- a/components/camel-file/src/main/docs/file-component.adoc
+++ b/components/camel-file/src/main/docs/file-component.adoc
@@ -53,7 +53,16 @@ options and `doneFileName` option that you can use. See also the section
 === URI Options
 
 // component options: START
-The File component has no options.
+The File component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -76,7 +85,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (87 parameters):
+==== Query Parameters (88 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -118,6 +127,7 @@ with the following path and query parameters:
 | *keepLastModified* (producer) | Will keep the last modified timestamp from the source file (if any). Will use the Exchange.FILE_LAST_MODIFIED header to located the timestamp. This header can contain either a java.util.Date or long with the timestamp. If the timestamp exists and the option is enabled it will set this timestamp on the written file. Note: This option only applies to the file producer. You cannot use this option with any of the ftp producers. | false | boolean
 | *moveExistingFileStrategy* (producer) | Strategy (Custom Strategy) used to move file with special naming token to use when fileExist=Move is configured. By default, there is an implementation used if no custom strategy is provided |  | FileMoveExisting Strategy
 | *autoCreate* (advanced) | Automatically create missing directories in the file's pathname. For the file consumer, that means creating the starting directory. For the file producer, it means the directory the files should be written to. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *bufferSize* (advanced) | Write buffer sized in bytes. | 131072 | int
 | *copyAndDeleteOnRenameFail* (advanced) | Whether to fallback and do a copy and delete file, in case the file could not be renamed directly. This option is not available for the FTP component. | true | boolean
 | *renameUsingCopy* (advanced) | Perform rename operations using a copy and delete strategy. This is primarily used in environments where the regular rename operation is unreliable (e.g. across different file systems or networks). This option takes precedence over the copyAndDeleteOnRenameFail parameter that will automatically fall back to the copy and delete strategy, but only after additional delays. | false | boolean
@@ -191,13 +201,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.file.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.file.enabled* | Whether to enable auto configuration of the file component. This is enabled by default. |  | Boolean
 | *camel.component.file.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-flatpack/src/main/docs/flatpack-component.adoc b/components/camel-flatpack/src/main/docs/flatpack-component.adoc
index 16d65cd..dcad471 100644
--- a/components/camel-flatpack/src/main/docs/flatpack-component.adoc
+++ b/components/camel-flatpack/src/main/docs/flatpack-component.adoc
@@ -42,7 +42,16 @@ You can append query options to the URI in the following format,
 ### URI Options
 
 // component options: START
-The Flatpack component has no options.
+The Flatpack component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -65,7 +74,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (25 parameters):
+==== Query Parameters (26 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -82,6 +91,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -114,13 +124,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.flatpack.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.flatpack.enabled* | Enable flatpack component | true | Boolean
 | *camel.component.flatpack.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 | *camel.dataformat.flatpack.allow-short-lines* | Allows for lines to be shorter than expected and ignores the extra characters | false | Boolean
diff --git a/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc b/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc
index 206e539..2df15ed 100644
--- a/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc
+++ b/components/camel-flatpack/src/main/docs/flatpack-dataformat.adoc
@@ -56,13 +56,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.flatpack.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.flatpack.enabled* | Enable flatpack component | true | Boolean
 | *camel.component.flatpack.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 | *camel.dataformat.flatpack.allow-short-lines* | Allows for lines to be shorter than expected and ignores the extra characters | false | Boolean
diff --git a/components/camel-flink/src/main/docs/flink-component.adoc b/components/camel-flink/src/main/docs/flink-component.adoc
index 8f78b01..fe15da9 100644
--- a/components/camel-flink/src/main/docs/flink-component.adoc
+++ b/components/camel-flink/src/main/docs/flink-component.adoc
@@ -58,7 +58,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (6 parameters):
+==== Query Parameters (7 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -69,6 +69,7 @@ with the following path and query parameters:
 | *dataSetCallback* (producer) | Function performing action against a DataSet. |  | DataSetCallback
 | *dataStream* (producer) | DataStream to compute against. |  | DataStream
 | *dataStreamCallback* (producer) | Function performing action against a DataStream. |  | DataStreamCallback
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -88,13 +89,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.flink.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.flink.data-set* | DataSet to compute against. The option is a org.apache.flink.api.java.DataSet type. |  | String
 | *camel.component.flink.data-set-callback* | Function performing action against a DataSet. The option is a org.apache.camel.component.flink.DataSetCallback type. |  | String
 | *camel.component.flink.data-stream* | DataStream to compute against. The option is a org.apache.flink.streaming.api.datastream.DataStream type. |  | String
@@ -113,7 +115,7 @@ The component supports 6 options, which are listed below.
 
 
 // component options: START
-The Apache Flink component supports 5 options, which are listed below.
+The Apache Flink component supports 6 options, which are listed below.
 
 
 
@@ -125,6 +127,7 @@ The Apache Flink component supports 5 options, which are listed below.
 | *dataSetCallback* (producer) | Function performing action against a DataSet. |  | DataSetCallback
 | *dataStreamCallback* (producer) | Function performing action against a DataStream. |  | DataStreamCallback
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
diff --git a/components/camel-fop/src/main/docs/fop-component.adoc b/components/camel-fop/src/main/docs/fop-component.adoc
index 7b2cd99..fb1c75f 100644
--- a/components/camel-fop/src/main/docs/fop-component.adoc
+++ b/components/camel-fop/src/main/docs/fop-component.adoc
@@ -63,7 +63,16 @@ http://svn.apache.org/repos/asf/xmlgraphics/commons/trunk/src/java/org/apache/xm
 ### Endpoint Options
 
 // component options: START
-The FOP component has no options.
+The FOP component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -87,7 +96,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (3 parameters):
+==== Query Parameters (4 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -95,6 +104,7 @@ with the following path and query parameters:
 | Name | Description | Default | Type
 | *fopFactory* (producer) | Allows to use a custom configured or implementation of org.apache.fop.apps.FopFactory. |  | FopFactory
 | *userConfigURL* (producer) | The location of a configuration file which can be loaded from classpath or file system. |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -114,13 +124,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.fop.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.fop.enabled* | Enable fop component | true | Boolean
 | *camel.component.fop.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-freemarker/src/main/docs/freemarker-component.adoc b/components/camel-freemarker/src/main/docs/freemarker-component.adoc
index 005e3a8..7ca18fe 100644
--- a/components/camel-freemarker/src/main/docs/freemarker-component.adoc
+++ b/components/camel-freemarker/src/main/docs/freemarker-component.adoc
@@ -40,7 +40,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The Freemarker component supports 2 options, which are listed below.
+The Freemarker component supports 3 options, which are listed below.
 
 
 
@@ -49,6 +49,7 @@ The Freemarker component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (advanced) | To use an existing freemarker.template.Configuration instance as the configuration. |  | Configuration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -75,7 +76,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (5 parameters):
+==== Query Parameters (6 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -85,6 +86,7 @@ with the following path and query parameters:
 | *contentCache* (producer) | Sets whether to use resource content cache or not | false | boolean
 | *encoding* (producer) | Sets the encoding to be used for loading the template file. |  | String
 | *templateUpdateDelay* (producer) | Number of seconds the loaded template resource will remain in the cache. |  | int
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -104,13 +106,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.freemarker.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.freemarker.configuration* | To use an existing freemarker.template.Configuration instance as the configuration. The option is a freemarker.template.Configuration type. |  | String
 | *camel.component.freemarker.enabled* | Enable freemarker component | true | Boolean
 | *camel.component.freemarker.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-ftp/src/main/docs/ftp-component.adoc b/components/camel-ftp/src/main/docs/ftp-component.adoc
index bc37ae6..a48b3ee 100644
--- a/components/camel-ftp/src/main/docs/ftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftp-component.adoc
@@ -74,7 +74,16 @@ The options below are exclusive for the FTP component.
 
 
 // component options: START
-The FTP component has no options.
+The FTP component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -100,7 +109,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (110 parameters):
+==== Query Parameters (111 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -156,6 +165,7 @@ with the following path and query parameters:
 | *sendNoop* (producer) | Whether to send a noop command as a pre-write check before uploading files to the FTP server. This is enabled by default as a validation of the connection is still valid, which allows to silently re-connect to be able to upload the file. However if this causes problems, you can turn this option off. | true | boolean
 | *activePortRange* (advanced) | Set the client side port range in active mode. The syntax is: minPort-maxPort Both port numbers are inclusive, eg 10000-19999 to include all 1xxxx ports. |  | String
 | *autoCreate* (advanced) | Automatically create missing directories in the file's pathname. For the file consumer, that means creating the starting directory. For the file producer, it means the directory the files should be written to. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *bufferSize* (advanced) | Write buffer sized in bytes. | 131072 | int
 | *connectTimeout* (advanced) | Sets the connect timeout for waiting for a connection to be established Used by both FTPClient and JSCH | 10000 | int
 | *ftpClient* (advanced) | To use a custom instance of FTPClient |  | FTPClient
@@ -234,13 +244,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ftp.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ftp.enabled* | Enable ftp component | true | Boolean
 | *camel.component.ftp.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-ftp/src/main/docs/ftps-component.adoc b/components/camel-ftp/src/main/docs/ftps-component.adoc
index 06cb341..9469afb 100644
--- a/components/camel-ftp/src/main/docs/ftps-component.adoc
+++ b/components/camel-ftp/src/main/docs/ftps-component.adoc
@@ -26,7 +26,7 @@ For more information you can look at <<ftp-component,FTP component>>
 The options below are exclusive for the FTPS component.
 
 // component options: START
-The FTPS component supports 2 options, which are listed below.
+The FTPS component supports 3 options, which are listed below.
 
 
 
@@ -35,6 +35,7 @@ The FTPS component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -60,7 +61,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (122 parameters):
+==== Query Parameters (123 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -116,6 +117,7 @@ with the following path and query parameters:
 | *sendNoop* (producer) | Whether to send a noop command as a pre-write check before uploading files to the FTP server. This is enabled by default as a validation of the connection is still valid, which allows to silently re-connect to be able to upload the file. However if this causes problems, you can turn this option off. | true | boolean
 | *activePortRange* (advanced) | Set the client side port range in active mode. The syntax is: minPort-maxPort Both port numbers are inclusive, eg 10000-19999 to include all 1xxxx ports. |  | String
 | *autoCreate* (advanced) | Automatically create missing directories in the file's pathname. For the file consumer, that means creating the starting directory. For the file producer, it means the directory the files should be written to. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *bufferSize* (advanced) | Write buffer sized in bytes. | 131072 | int
 | *connectTimeout* (advanced) | Sets the connect timeout for waiting for a connection to be established Used by both FTPClient and JSCH | 10000 | int
 | *ftpClient* (advanced) | To use a custom instance of FTPClient |  | FTPClient
@@ -206,13 +208,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ftps.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ftps.enabled* | Enable ftps component | true | Boolean
 | *camel.component.ftps.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 | *camel.component.ftps.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
diff --git a/components/camel-ftp/src/main/docs/sftp-component.adoc b/components/camel-ftp/src/main/docs/sftp-component.adoc
index 0b5bcce..6739d42 100644
--- a/components/camel-ftp/src/main/docs/sftp-component.adoc
+++ b/components/camel-ftp/src/main/docs/sftp-component.adoc
@@ -26,7 +26,16 @@ For more information you can look at <<ftp-component,FTP component>>
 The options below are exclusive for the FTPS component.
 
 // component options: START
-The SFTP component has no options.
+The SFTP component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -51,7 +60,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (118 parameters):
+==== Query Parameters (119 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -99,6 +108,7 @@ with the following path and query parameters:
 | *moveExistingFileStrategy* (producer) | Strategy (Custom Strategy) used to move file with special naming token to use when fileExist=Move is configured. By default, there is an implementation used if no custom strategy is provided |  | FileMoveExisting Strategy
 | *sendNoop* (producer) | Whether to send a noop command as a pre-write check before uploading files to the FTP server. This is enabled by default as a validation of the connection is still valid, which allows to silently re-connect to be able to upload the file. However if this causes problems, you can turn this option off. | true | boolean
 | *autoCreate* (advanced) | Automatically create missing directories in the file's pathname. For the file consumer, that means creating the starting directory. For the file producer, it means the directory the files should be written to. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *bindAddress* (advanced) | Specifies the address of the local interface against which the connection should bind. |  | String
 | *bufferSize* (advanced) | Write buffer sized in bytes. | 131072 | int
 | *bulkRequests* (advanced) | Specifies how many requests may be outstanding at any one time. Increasing this value may slightly improve file transfer speed but will increase memory usage. |  | Integer
diff --git a/components/camel-ganglia/src/main/docs/ganglia-component.adoc b/components/camel-ganglia/src/main/docs/ganglia-component.adoc
index f0767be..52ee90a 100644
--- a/components/camel-ganglia/src/main/docs/ganglia-component.adoc
+++ b/components/camel-ganglia/src/main/docs/ganglia-component.adoc
@@ -51,7 +51,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The Ganglia component supports 2 options, which are listed below.
+The Ganglia component supports 3 options, which are listed below.
 
 
 
@@ -60,6 +60,7 @@ The Ganglia component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (advanced) | To use the shared configuration |  | GangliaConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -88,7 +89,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -106,6 +107,7 @@ with the following path and query parameters:
 | *type* (producer) | The type of value | STRING | GMetricType
 | *units* (producer) | Any unit of measurement that qualifies the metric, e.g. widgets, litres, bytes. Do not include a prefix such as k (kilo) or m (milli), other tools may scale the units later. The value should be unscaled. |  | String
 | *wireFormat31x* (producer) | Use the wire format of Ganglia 3.1.0 and later versions. Set this to false to use Ganglia 3.0.x or earlier. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -125,13 +127,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 16 options, which are listed below.
+The component supports 17 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ganglia.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ganglia.configuration.dmax* | Minumum time in seconds before Ganglia will purge the metric value if it expires. Set to 0 and the value will remain in Ganglia indefinitely until a gmond agent restart. | 0 | Integer
 | *camel.component.ganglia.configuration.group-name* | The group that the metric belongs to. | java | String
 | *camel.component.ganglia.configuration.host* | Host name for Ganglia server | 239.2.11.71 | String
diff --git a/components/camel-geocoder/src/main/docs/geocoder-component.adoc b/components/camel-geocoder/src/main/docs/geocoder-component.adoc
index fb6b64a..44a48f5 100644
--- a/components/camel-geocoder/src/main/docs/geocoder-component.adoc
+++ b/components/camel-geocoder/src/main/docs/geocoder-component.adoc
@@ -33,7 +33,16 @@ geocoder:latlng:latitude,longitude[?options]
 
 
 // component options: START
-The Geocoder component has no options.
+The Geocoder component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -59,7 +68,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -67,6 +76,7 @@ with the following path and query parameters:
 | Name | Description | Default | Type
 | *headersOnly* (producer) | Whether to only enrich the Exchange with headers, and leave the body as-is. | false | boolean
 | *language* (producer) | The language to use. | en | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *proxyAuthDomain* (proxy) | Domain for proxy NTML authentication |  | String
 | *proxyAuthHost* (proxy) | Optional host for proxy NTML authentication |  | String
@@ -96,13 +106,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.geocoder.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.geocoder.enabled* | Enable geocoder component | true | Boolean
 | *camel.component.geocoder.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-git/src/main/docs/git-component.adoc b/components/camel-git/src/main/docs/git-component.adoc
index 4b3378b..85451c7 100644
--- a/components/camel-git/src/main/docs/git-component.adoc
+++ b/components/camel-git/src/main/docs/git-component.adoc
@@ -30,7 +30,16 @@ repository.
 
 
 // component options: START
-The Git component has no options.
+The Git component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -55,7 +64,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -73,6 +82,7 @@ with the following path and query parameters:
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *allowEmpty* (producer) | The flag to manage empty git commits | true | boolean
 | *operation* (producer) | The operation to do on the repository |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -92,13 +102,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.git.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.git.enabled* | Enable git component | true | Boolean
 | *camel.component.git.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-github/src/main/docs/github-component.adoc b/components/camel-github/src/main/docs/github-component.adoc
index ad09233..7419687 100644
--- a/components/camel-github/src/main/docs/github-component.adoc
+++ b/components/camel-github/src/main/docs/github-component.adoc
@@ -46,7 +46,16 @@ Note that these can be configured directly through the endpoint.
 
 
 // component options: START
-The GitHub component has no options.
+The GitHub component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -71,7 +80,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (12 parameters):
+==== Query Parameters (13 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -88,6 +97,7 @@ with the following path and query parameters:
 | *encoding* (producer) | To use the given encoding when getting a git commit file |  | String
 | *state* (producer) | To set git commit status state |  | String
 | *targetUrl* (producer) | To set git commit status target url |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -107,13 +117,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.github.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.github.enabled* | Enable github component | true | Boolean
 | *camel.component.github.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc b/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
index 9b39183..a82fff2 100644
--- a/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
+++ b/components/camel-google-bigquery/src/main/docs/google-bigquery-component.adoc
@@ -57,7 +57,7 @@ Service Account Email and Service Account Key can be found in the GCP JSON crede
 === Options
 
 // component options: START
-The Google BigQuery component supports 4 options, which are listed below.
+The Google BigQuery component supports 5 options, which are listed below.
 
 
 
@@ -68,6 +68,7 @@ The Google BigQuery component supports 4 options, which are listed below.
 | *datasetId* (producer) | BigQuery Dataset Id |  | String
 | *connectionFactory* (producer) | ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used |  | GoogleBigQuery ConnectionFactory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -92,7 +93,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (3 parameters):
+==== Query Parameters (4 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,6 +101,7 @@ with the following path and query parameters:
 | Name | Description | Default | Type
 | *connectionFactory* (producer) | ConnectionFactory to obtain connection to Bigquery Service. If non provided the default will be used. |  | GoogleBigQuery ConnectionFactory
 | *useAsInsertId* (producer) | Field name to use as insert id |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -119,13 +121,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 8 options, which are listed below.
+The component supports 9 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-bigquery.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-bigquery.connection-factory.credentials-file-location* |  |  | String
 | *camel.component.google-bigquery.connection-factory.service-account* |  |  | String
 | *camel.component.google-bigquery.connection-factory.service-account-key* |  |  | String
diff --git a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
index 10e9438..465a282 100644
--- a/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
+++ b/components/camel-google-bigquery/src/main/docs/google-bigquery-sql-component.adoc
@@ -76,7 +76,7 @@ You can externalize your SQL queries to files in the classpath or file system as
 === Options
 
 // component options: START
-The Google BigQuery Standard SQL component supports 3 options, which are listed below.
+The Google BigQuery Standard SQL component supports 4 options, which are listed below.
 
 
 
@@ -86,6 +86,7 @@ The Google BigQuery Standard SQL component supports 3 options, which are listed
 | *projectId* (producer) | Google Cloud Project Id |  | String
 | *connectionFactory* (producer) | ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used |  | GoogleBigQuery ConnectionFactory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -109,13 +110,14 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (2 parameters):
+==== Query Parameters (3 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *connectionFactory* (producer) | ConnectionFactory to obtain connection to Bigquery Service. If non provided the default will be used. |  | GoogleBigQuery ConnectionFactory
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -135,13 +137,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 7 options, which are listed below.
+The component supports 8 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-bigquery-sql.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-bigquery-sql.connection-factory.credentials-file-location* |  |  | String
 | *camel.component.google-bigquery-sql.connection-factory.service-account* |  |  | String
 | *camel.component.google-bigquery-sql.connection-factory.service-account-key* |  |  | String
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
index a155673..6864f64 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-component.adoc
@@ -36,7 +36,7 @@ for this component:
 
 
 // component options: START
-The Google Calendar component supports 3 options, which are listed below.
+The Google Calendar component supports 4 options, which are listed below.
 
 
 
@@ -46,6 +46,7 @@ The Google Calendar component supports 3 options, which are listed below.
 | *configuration* (common) | To use the shared configuration |  | GoogleCalendar Configuration
 | *clientFactory* (advanced) | To use the GoogleCalendarClientFactory as factory for creating the client. Will by default use BatchGoogleCalendarClientFactory |  | GoogleCalendarClient Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -76,7 +77,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (14 parameters):
+==== Query Parameters (15 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -95,6 +96,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -114,13 +116,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 14 options, which are listed below.
+The component supports 15 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-calendar.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-calendar.client-factory* | To use the GoogleCalendarClientFactory as factory for creating the client. Will by default use BatchGoogleCalendarClientFactory. The option is a org.apache.camel.component.google.calendar.GoogleCalendarClientFactory type. |  | String
 | *camel.component.google-calendar.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
 | *camel.component.google-calendar.configuration.api-name* | What kind of operation to perform |  | GoogleCalendarApiName
diff --git a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
index e6e49ea..5be2183 100644
--- a/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
+++ b/components/camel-google-calendar/src/main/docs/google-calendar-stream-component.adoc
@@ -43,7 +43,7 @@ The Google Calendar Component uses the following URI format:
 
 
 // component options: START
-The Google Calendar Stream component supports 3 options, which are listed below.
+The Google Calendar Stream component supports 4 options, which are listed below.
 
 
 
@@ -53,6 +53,7 @@ The Google Calendar Stream component supports 3 options, which are listed below.
 | *configuration* (advanced) | The configuration |  | GoogleCalendarStream Configuration
 | *clientFactory* (advanced) | The client Factory |  | GoogleCalendarClient Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -78,7 +79,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (30 parameters):
+==== Query Parameters (31 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -100,6 +101,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -132,13 +134,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 15 options, which are listed below.
+The component supports 16 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-calendar-stream.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-calendar-stream.client-factory* | The client Factory. The option is a org.apache.camel.component.google.calendar.GoogleCalendarClientFactory type. |  | String
 | *camel.component.google-calendar-stream.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
 | *camel.component.google-calendar-stream.configuration.application-name* | Google Calendar application name. Example would be "camel-google-calendar/1.0" |  | String
diff --git a/components/camel-google-drive/src/main/docs/google-drive-component.adoc b/components/camel-google-drive/src/main/docs/google-drive-component.adoc
index 6b97f2d..f772234 100644
--- a/components/camel-google-drive/src/main/docs/google-drive-component.adoc
+++ b/components/camel-google-drive/src/main/docs/google-drive-component.adoc
@@ -63,7 +63,7 @@ Endpoint prefix can be one of:
 
 
 // component options: START
-The Google Drive component supports 3 options, which are listed below.
+The Google Drive component supports 4 options, which are listed below.
 
 
 
@@ -73,6 +73,7 @@ The Google Drive component supports 3 options, which are listed below.
 | *configuration* (common) | To use the shared configuration |  | GoogleDrive Configuration
 | *clientFactory* (advanced) | To use the GoogleCalendarClientFactory as factory for creating the client. Will by default use BatchGoogleDriveClientFactory |  | GoogleDriveClient Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -103,7 +104,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (12 parameters):
+==== Query Parameters (13 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -120,6 +121,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -139,13 +141,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 11 options, which are listed below.
+The component supports 12 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-drive.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-drive.client-factory* | To use the GoogleCalendarClientFactory as factory for creating the client. Will by default use BatchGoogleDriveClientFactory. The option is a org.apache.camel.component.google.drive.GoogleDriveClientFactory type. |  | String
 | *camel.component.google-drive.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
 | *camel.component.google-drive.configuration.api-name* | What kind of operation to perform |  | GoogleDriveApiName
diff --git a/components/camel-google-mail/src/main/docs/google-mail-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-component.adoc
index 3bb533a..b840c08 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-component.adoc
@@ -56,7 +56,7 @@ Endpoint prefix can be one of:
 
 
 // component options: START
-The Google Mail component supports 3 options, which are listed below.
+The Google Mail component supports 4 options, which are listed below.
 
 
 
@@ -66,6 +66,7 @@ The Google Mail component supports 3 options, which are listed below.
 | *configuration* (common) | To use the shared configuration |  | GoogleMailConfiguration
 | *clientFactory* (advanced) | To use the GoogleCalendarClientFactory as factory for creating the client. Will by default use BatchGoogleMailClientFactory |  | GoogleMailClient Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -95,7 +96,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (10 parameters):
+==== Query Parameters (11 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -110,6 +111,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -129,13 +131,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 10 options, which are listed below.
+The component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-mail.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-mail.client-factory* | To use the GoogleCalendarClientFactory as factory for creating the client. Will by default use BatchGoogleMailClientFactory. The option is a org.apache.camel.component.google.mail.GoogleMailClientFactory type. |  | String
 | *camel.component.google-mail.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
 | *camel.component.google-mail.configuration.api-name* | What kind of operation to perform |  | GoogleMailApiName
diff --git a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
index cd99844..a50f0e1 100644
--- a/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
+++ b/components/camel-google-mail/src/main/docs/google-mail-stream-component.adoc
@@ -43,7 +43,7 @@ The GoogleMail Component uses the following URI format:
 
 
 // component options: START
-The Google Mail Stream component supports 3 options, which are listed below.
+The Google Mail Stream component supports 4 options, which are listed below.
 
 
 
@@ -53,6 +53,7 @@ The Google Mail Stream component supports 3 options, which are listed below.
 | *configuration* (advanced) | The configuration |  | GoogleMailStream Configuration
 | *clientFactory* (advanced) | The client Factory |  | GoogleMailClient Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -78,7 +79,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (28 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +99,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -130,13 +132,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 13 options, which are listed below.
+The component supports 14 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-mail-stream.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-mail-stream.client-factory* | The client Factory. The option is a org.apache.camel.component.google.mail.GoogleMailClientFactory type. |  | String
 | *camel.component.google-mail-stream.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
 | *camel.component.google-mail-stream.configuration.application-name* | Google mail application name. Example would be "camel-google-mail/1.0" |  | String
diff --git a/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc b/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
index fa5cec6..0ab0e2f 100644
--- a/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
+++ b/components/camel-google-pubsub/src/main/docs/google-pubsub-component.adoc
@@ -35,7 +35,7 @@ Destination Name can be either a topic or a subscription name.
 === Options
 
 // component options: START
-The Google Pubsub component supports 2 options, which are listed below.
+The Google Pubsub component supports 3 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The Google Pubsub component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *connectionFactory* (common) | Sets the connection factory to use: provides the ability to explicitly manage connection credentials: - the path to the key file - the Service Account Key / Email pair |  | GooglePubsubConnection Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -67,7 +68,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (9 parameters):
+==== Query Parameters (10 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -81,6 +82,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -100,13 +102,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-pubsub.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-pubsub.connection-factory.credentials-file-location* |  |  | String
 | *camel.component.google-pubsub.connection-factory.service-account* |  |  | String
 | *camel.component.google-pubsub.connection-factory.service-account-key* |  |  | String
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
index a5782d3..5fc9a0a 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-component.adoc
@@ -51,7 +51,7 @@ Endpoint prefix can be one of:
 
 
 // component options: START
-The Google Sheets component supports 3 options, which are listed below.
+The Google Sheets component supports 4 options, which are listed below.
 
 
 
@@ -61,6 +61,7 @@ The Google Sheets component supports 3 options, which are listed below.
 | *configuration* (common) | To use the shared configuration |  | GoogleSheets Configuration
 | *clientFactory* (advanced) | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory |  | GoogleSheetsClient Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -90,7 +91,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (10 parameters):
+==== Query Parameters (11 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -105,6 +106,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -124,13 +126,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 10 options, which are listed below.
+The component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-sheets.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-sheets.client-factory* | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory. The option is a org.apache.camel.component.google.sheets.GoogleSheetsClientFactory type. |  | String
 | *camel.component.google-sheets.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
 | *camel.component.google-sheets.configuration.api-name* | What kind of operation to perform |  | GoogleSheetsApiName
diff --git a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
index 14d221c..c2caf17 100644
--- a/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
+++ b/components/camel-google-sheets/src/main/docs/google-sheets-stream-component.adoc
@@ -43,7 +43,7 @@ The Google Sheets Component uses the following URI format:
 
 
 // component options: START
-The Google Sheets Stream component supports 3 options, which are listed below.
+The Google Sheets Stream component supports 4 options, which are listed below.
 
 
 
@@ -53,6 +53,7 @@ The Google Sheets Stream component supports 3 options, which are listed below.
 | *configuration* (consumer) | To use the shared configuration |  | GoogleSheetsStream Configuration
 | *clientFactory* (advanced) | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory |  | GoogleSheetsClient Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -78,7 +79,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (31 parameters):
+==== Query Parameters (32 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -101,6 +102,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -133,13 +135,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 16 options, which are listed below.
+The component supports 17 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.google-sheets-stream.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.google-sheets-stream.client-factory* | To use the GoogleSheetsClientFactory as factory for creating the client. Will by default use BatchGoogleSheetsClientFactory. The option is a org.apache.camel.component.google.sheets.GoogleSheetsClientFactory type. |  | String
 | *camel.component.google-sheets-stream.configuration.access-token* | OAuth 2 access token. This typically expires after an hour so refreshToken is recommended for long term usage. |  | String
 | *camel.component.google-sheets-stream.configuration.api-name* | Sets the apiName. |  | String
diff --git a/components/camel-gora/src/main/docs/gora-component.adoc b/components/camel-gora/src/main/docs/gora-component.adoc
index df4dfcd..ecd1f7b 100644
--- a/components/camel-gora/src/main/docs/gora-component.adoc
+++ b/components/camel-gora/src/main/docs/gora-component.adoc
@@ -76,7 +76,16 @@ http://gora.apache.org/current/gora-conf.html[gora-conf] page.
 
 
 // component options: START
-The Gora component has no options.
+The Gora component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -102,7 +111,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (21 parameters):
+==== Query Parameters (22 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -127,6 +136,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *flushOnEveryOperation* (producer) | Flush on every operation | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *hadoopConfiguration* (advanced) | Hadoop Configuration |  | Configuration
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
@@ -147,13 +157,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.gora.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.gora.enabled* | Enable gora component | true | Boolean
 | *camel.component.gora.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-grape/src/main/docs/grape-component.adoc b/components/camel-grape/src/main/docs/grape-component.adoc
index 54610d7..b6ed42c 100644
--- a/components/camel-grape/src/main/docs/grape-component.adoc
+++ b/components/camel-grape/src/main/docs/grape-component.adoc
@@ -13,7 +13,7 @@ without the restart of the router.
 ### Grape options
 
 // component options: START
-The Grape component supports 2 options, which are listed below.
+The Grape component supports 3 options, which are listed below.
 
 
 
@@ -22,6 +22,7 @@ The Grape component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *patchesRepository* (advanced) | Implementation of org.apache.camel.component.grape.PatchesRepository, by default: FilePatchesRepository |  | PatchesRepository
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -45,12 +46,13 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (1 parameters):
+==== Query Parameters (2 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
diff --git a/components/camel-grpc/src/main/docs/grpc-component.adoc b/components/camel-grpc/src/main/docs/grpc-component.adoc
index a25f445..a7dbbf7 100644
--- a/components/camel-grpc/src/main/docs/grpc-component.adoc
+++ b/components/camel-grpc/src/main/docs/grpc-component.adoc
@@ -40,7 +40,16 @@ grpc://service[?options]
 ### Endpoint Options
 
 // component options: START
-The gRPC component has no options.
+The gRPC component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -64,7 +73,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (25 parameters):
+==== Query Parameters (26 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -83,6 +92,7 @@ with the following path and query parameters:
 | *producerStrategy* (producer) | The mode used to communicate with a remote gRPC server. In SIMPLE mode a single exchange is translated into a remote procedure call. In STREAMING mode all exchanges will be sent within the same request (input and output of the recipient gRPC service must be of type 'stream'). | SIMPLE | GrpcProducerStrategy
 | *streamRepliesTo* (producer) | When using STREAMING client mode, it indicates the endpoint where responses should be forwarded. |  | String
 | *userAgent* (producer) | The user agent header passed to the server |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *authenticationType* (security) | Authentication method type in advance to the SSL/TLS negotiation | NONE | GrpcAuthType
 | *jwtAlgorithm* (security) | JSON Web Token sign algorithm | HMAC256 | JwtAlgorithm
@@ -113,13 +123,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.grpc.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.grpc.enabled* | Enable grpc component | true | Boolean
 | *camel.component.grpc.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-guava-eventbus/src/main/docs/guava-eventbus-component.adoc b/components/camel-guava-eventbus/src/main/docs/guava-eventbus-component.adoc
index 8b2255d..713556a 100644
--- a/components/camel-guava-eventbus/src/main/docs/guava-eventbus-component.adoc
+++ b/components/camel-guava-eventbus/src/main/docs/guava-eventbus-component.adoc
@@ -46,7 +46,7 @@ registry.
 
 
 // component options: START
-The Guava EventBus component supports 3 options, which are listed below.
+The Guava EventBus component supports 4 options, which are listed below.
 
 
 
@@ -56,6 +56,7 @@ The Guava EventBus component supports 3 options, which are listed below.
 | *eventBus* (common) | To use the given Guava EventBus instance |  | EventBus
 | *listenerInterface* (common) | The interface with method(s) marked with the Subscribe annotation. Dynamic proxy will be created over the interface so it could be registered as the EventBus listener. Particularly useful when creating multi-event listeners and for handling DeadEvent properly. This option cannot be used together with eventClass option. |  | Class
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -82,7 +83,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (6 parameters):
+==== Query Parameters (7 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -93,6 +94,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -112,13 +114,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.guava-eventbus.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.guava-eventbus.enabled* | Enable guava-eventbus component | true | Boolean
 | *camel.component.guava-eventbus.event-bus* | To use the given Guava EventBus instance. The option is a com.google.common.eventbus.EventBus type. |  | String
 | *camel.component.guava-eventbus.listener-interface* | The interface with method(s) marked with the Subscribe annotation. Dynamic proxy will be created over the interface so it could be registered as the EventBus listener. Particularly useful when creating multi-event listeners and for handling DeadEvent properly. This option cannot be used together with eventClass option. |  | Class
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc
index 02d2f16..1760015 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-atomicvalue-component.adoc
@@ -12,7 +12,7 @@ An atomic number is an object that simply provides a grid wide number (long).
 ### Options
 
 // component options: START
-The Hazelcast Atomic Number component supports 3 options, which are listed below.
+The Hazelcast Atomic Number component supports 4 options, which are listed below.
 
 
 
@@ -22,6 +22,7 @@ The Hazelcast Atomic Number component supports 3 options, which are listed below
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -44,7 +45,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (10 parameters):
+==== Query Parameters (11 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -54,6 +55,7 @@ with the following path and query parameters:
 | *defaultOperation* (producer) | To specify a default operation to use, if no operation header has been provided. |  | HazelcastOperation
 | *hazelcastInstance* (producer) | The hazelcast instance reference which can be used for hazelcast endpoint. |  | HazelcastInstance
 | *hazelcastInstanceName* (producer) | The hazelcast instance reference name which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -78,13 +80,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-atomicvalue.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-atomicvalue.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-atomicvalue.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
 | *camel.component.hazelcast-atomicvalue.enabled* | Enable hazelcast-atomicvalue component | true | Boolean
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-instance-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-instance-component.adoc
index 41eb260..d275a73 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-instance-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-instance-component.adoc
@@ -12,7 +12,7 @@ Hazelcast makes sense in one single "server node", but it's extremly powerful in
 ### Options
 
 // component options: START
-The Hazelcast Instance component supports 3 options, which are listed below.
+The Hazelcast Instance component supports 4 options, which are listed below.
 
 
 
@@ -22,6 +22,7 @@ The Hazelcast Instance component supports 3 options, which are listed below.
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 // endpoint options: START
@@ -43,7 +44,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -59,6 +60,7 @@ with the following path and query parameters:
 | *queueConsumerMode* (consumer) | Define the Queue Consumer mode: Listen or Poll | Listen | HazelcastQueueConsumer Mode
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -83,7 +85,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 26 options, which are listed below.
+The component supports 27 options, which are listed below.
 
 
 
@@ -92,6 +94,7 @@ The component supports 26 options, which are listed below.
 | Name | Description | Default | Type
 | *camel.component.hazelcast-atomicvalue.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-atomicvalue.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
+| *camel.component.hazelcast-instance.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-instance.enabled* | Enable hazelcast-instance component | true | Boolean
 | *camel.component.hazelcast-instance.hazelcast-instance* | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. The option is a com.hazelcast.core.HazelcastInstance type. |  | String
 | *camel.component.hazelcast-instance.hazelcast-mode* | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-list-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-list-component.adoc
index 0f5d992..bd8408c 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-list-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-list-component.adoc
@@ -8,7 +8,7 @@ The http://www.hazelcast.com/[Hazelcast] List component is one of Camel Hazelcas
 ### Options
 
 // component options: START
-The Hazelcast List component supports 3 options, which are listed below.
+The Hazelcast List component supports 4 options, which are listed below.
 
 
 
@@ -18,6 +18,7 @@ The Hazelcast List component supports 3 options, which are listed below.
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 // endpoint options: START
@@ -39,7 +40,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -55,6 +56,7 @@ with the following path and query parameters:
 | *queueConsumerMode* (consumer) | Define the Queue Consumer mode: Listen or Poll | Listen | HazelcastQueueConsumer Mode
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -79,13 +81,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-list.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-list.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-list.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
 | *camel.component.hazelcast-list.enabled* | Enable hazelcast-list component | true | Boolean
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc
index fe8564d..3e6bc40 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-map-component.adoc
@@ -9,7 +9,7 @@ The http://www.hazelcast.com/[Hazelcast] Map component is one of Camel Hazelcast
 ### Options
 
 // component options: START
-The Hazelcast Map component supports 3 options, which are listed below.
+The Hazelcast Map component supports 4 options, which are listed below.
 
 
 
@@ -19,6 +19,7 @@ The Hazelcast Map component supports 3 options, which are listed below.
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 // endpoint options: START
@@ -40,7 +41,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -56,6 +57,7 @@ with the following path and query parameters:
 | *queueConsumerMode* (consumer) | Define the Queue Consumer mode: Listen or Poll | Listen | HazelcastQueueConsumer Mode
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -80,13 +82,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-map.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-map.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-map.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
 | *camel.component.hazelcast-map.enabled* | Enable hazelcast-map component | true | Boolean
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc
index 9f257a0..309dc06 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-multimap-component.adoc
@@ -9,7 +9,7 @@ The http://www.hazelcast.com/[Hazelcast] Multimap component is one of Camel Haze
 ### Options
 
 // component options: START
-The Hazelcast Multimap component supports 3 options, which are listed below.
+The Hazelcast Multimap component supports 4 options, which are listed below.
 
 
 
@@ -19,6 +19,7 @@ The Hazelcast Multimap component supports 3 options, which are listed below.
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -41,7 +42,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -57,6 +58,7 @@ with the following path and query parameters:
 | *queueConsumerMode* (consumer) | Define the Queue Consumer mode: Listen or Poll | Listen | HazelcastQueueConsumer Mode
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -81,13 +83,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-multimap.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-multimap.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-multimap.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
 | *camel.component.hazelcast-multimap.enabled* | Enable hazelcast-multimap component | true | Boolean
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-queue-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-queue-component.adoc
index 0267fad..468959d 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-queue-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-queue-component.adoc
@@ -9,7 +9,7 @@ The http://www.hazelcast.com/[Hazelcast] Queue component is one of Camel Hazelca
 ### Options
 
 // component options: START
-The Hazelcast Queue component supports 3 options, which are listed below.
+The Hazelcast Queue component supports 4 options, which are listed below.
 
 
 
@@ -19,6 +19,7 @@ The Hazelcast Queue component supports 3 options, which are listed below.
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 // endpoint options: START
@@ -40,7 +41,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -56,6 +57,7 @@ with the following path and query parameters:
 | *queueConsumerMode* (consumer) | Define the Queue Consumer mode: Listen or Poll | Listen | HazelcastQueueConsumer Mode
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -80,13 +82,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-queue.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-queue.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-queue.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
 | *camel.component.hazelcast-queue.enabled* | Enable hazelcast-queue component | true | Boolean
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc
index 7d1cb80..27a91fb 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-replicatedmap-component.adoc
@@ -10,7 +10,7 @@ A replicated map is a weakly consistent, distributed key-value data structure wi
 ### Options
 
 // component options: START
-The Hazelcast Replicated Map component supports 3 options, which are listed below.
+The Hazelcast Replicated Map component supports 4 options, which are listed below.
 
 
 
@@ -20,6 +20,7 @@ The Hazelcast Replicated Map component supports 3 options, which are listed belo
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 // endpoint options: START
@@ -41,7 +42,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -57,6 +58,7 @@ with the following path and query parameters:
 | *queueConsumerMode* (consumer) | Define the Queue Consumer mode: Listen or Poll | Listen | HazelcastQueueConsumer Mode
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -81,13 +83,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-replicatedmap.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-replicatedmap.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-replicatedmap.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
 | *camel.component.hazelcast-replicatedmap.enabled* | Enable hazelcast-replicatedmap component | true | Boolean
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc
index c9e7e0f..9886e75 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-ringbuffer-component.adoc
@@ -11,7 +11,7 @@ Ringbuffer is a distributed data structure where the data is stored in a ring-li
 ### Options
 
 // component options: START
-The Hazelcast Ringbuffer component supports 3 options, which are listed below.
+The Hazelcast Ringbuffer component supports 4 options, which are listed below.
 
 
 
@@ -21,6 +21,7 @@ The Hazelcast Ringbuffer component supports 3 options, which are listed below.
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -43,7 +44,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (10 parameters):
+==== Query Parameters (11 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -53,6 +54,7 @@ with the following path and query parameters:
 | *defaultOperation* (producer) | To specify a default operation to use, if no operation header has been provided. |  | HazelcastOperation
 | *hazelcastInstance* (producer) | The hazelcast instance reference which can be used for hazelcast endpoint. |  | HazelcastInstance
 | *hazelcastInstanceName* (producer) | The hazelcast instance reference name which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -77,13 +79,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-ringbuffer.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-ringbuffer.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-ringbuffer.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
 | *camel.component.hazelcast-ringbuffer.enabled* | Enable hazelcast-ringbuffer component | true | Boolean
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-seda-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-seda-component.adoc
index d475c5a..4165044 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-seda-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-seda-component.adoc
@@ -10,7 +10,7 @@ SEDA component differs from the rest components provided. It implements a work-q
 ### Options
 
 // component options: START
-The Hazelcast SEDA component supports 3 options, which are listed below.
+The Hazelcast SEDA component supports 4 options, which are listed below.
 
 
 
@@ -20,6 +20,7 @@ The Hazelcast SEDA component supports 3 options, which are listed below.
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 // endpoint options: START
@@ -41,7 +42,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -57,6 +58,7 @@ with the following path and query parameters:
 | *queueConsumerMode* (consumer) | Define the Queue Consumer mode: Listen or Poll | Listen | HazelcastQueueConsumer Mode
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -81,13 +83,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-seda.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-seda.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-seda.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
 | *camel.component.hazelcast-seda.enabled* | Enable hazelcast-seda component | true | Boolean
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-set-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-set-component.adoc
index 6f5d9993..308ecb7 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-set-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-set-component.adoc
@@ -9,7 +9,7 @@ The http://www.hazelcast.com/[Hazelcast] Set component is one of Camel Hazelcast
 ### Options
 
 // component options: START
-The Hazelcast Set component supports 3 options, which are listed below.
+The Hazelcast Set component supports 4 options, which are listed below.
 
 
 
@@ -19,6 +19,7 @@ The Hazelcast Set component supports 3 options, which are listed below.
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 // endpoint options: START
@@ -40,7 +41,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -56,6 +57,7 @@ with the following path and query parameters:
 | *queueConsumerMode* (consumer) | Define the Queue Consumer mode: Listen or Poll | Listen | HazelcastQueueConsumer Mode
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -80,13 +82,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-set.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-set.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-set.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
 | *camel.component.hazelcast-set.enabled* | Enable hazelcast-set component | true | Boolean
diff --git a/components/camel-hazelcast/src/main/docs/hazelcast-topic-component.adoc b/components/camel-hazelcast/src/main/docs/hazelcast-topic-component.adoc
index c98a62a..39c4560 100644
--- a/components/camel-hazelcast/src/main/docs/hazelcast-topic-component.adoc
+++ b/components/camel-hazelcast/src/main/docs/hazelcast-topic-component.adoc
@@ -9,7 +9,7 @@ The http://www.hazelcast.com/[Hazelcast] Topic component is one of Camel Hazelca
 ### Options
 
 // component options: START
-The Hazelcast Topic component supports 3 options, which are listed below.
+The Hazelcast Topic component supports 4 options, which are listed below.
 
 
 
@@ -19,6 +19,7 @@ The Hazelcast Topic component supports 3 options, which are listed below.
 | *hazelcastInstance* (advanced) | The hazelcast instance reference which can be used for hazelcast endpoint. If you don't specify the instance reference, camel use the default hazelcast instance from the camel-hazelcast instance. |  | HazelcastInstance
 | *hazelcastMode* (advanced) | The hazelcast mode reference which kind of instance should be used. If you don't specify the mode, then the node mode will be the default. | node | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 // endpoint options: START
@@ -40,7 +41,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -56,6 +57,7 @@ with the following path and query parameters:
 | *queueConsumerMode* (consumer) | Define the Queue Consumer mode: Listen or Poll | Listen | HazelcastQueueConsumer Mode
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *concurrentConsumers* (seda) | To use concurrent consumers polling from the SEDA queue. | 1 | int
 | *onErrorDelay* (seda) | Milliseconds before consumer continues polling after an error has occurred. | 1000 | int
@@ -80,13 +82,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 8 options, which are listed below.
+The component supports 9 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hazelcast-topic.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hazelcast-topic.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-topic.customizer.hazelcast-instance.enabled* | Enable or disable the cache-manager customizer. | true | Boolean
 | *camel.component.hazelcast-topic.customizer.hazelcast-instance.override* | Configure if the cache manager eventually set on the component should be overridden by the customizer. | false | Boolean
diff --git a/components/camel-hbase/src/main/docs/hbase-component.adoc b/components/camel-hbase/src/main/docs/hbase-component.adoc
index 514161d..2ad818a 100644
--- a/components/camel-hbase/src/main/docs/hbase-component.adoc
+++ b/components/camel-hbase/src/main/docs/hbase-component.adoc
@@ -102,7 +102,7 @@ The supported operations are:
 
 
 // component options: START
-The HBase component supports 3 options, which are listed below.
+The HBase component supports 4 options, which are listed below.
 
 
 
@@ -112,6 +112,7 @@ The HBase component supports 3 options, which are listed below.
 | *configuration* (advanced) | To use the shared configuration |  | Configuration
 | *poolMaxSize* (common) | Maximum number of references to keep for each table in the HTable pool. The default value is 10. | 10 | int
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -139,7 +140,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -160,6 +161,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *maxResults* (producer) | The maximum number of rows to scan. | 100 | int
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -179,13 +181,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hbase.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hbase.configuration* | To use the shared configuration. The option is a org.apache.hadoop.conf.Configuration type. |  | String
 | *camel.component.hbase.enabled* | Enable hbase component | true | Boolean
 | *camel.component.hbase.pool-max-size* | Maximum number of references to keep for each table in the HTable pool. The default value is 10. | 10 | Integer
diff --git a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
index 368ddc8..d09dc10 100644
--- a/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
+++ b/components/camel-hdfs2/src/main/docs/hdfs2-component.adoc
@@ -54,7 +54,7 @@ fileMode=Append to append each of the chunks together.
 
 
 // component options: START
-The HDFS2 component supports 2 options, which are listed below.
+The HDFS2 component supports 3 options, which are listed below.
 
 
 
@@ -63,6 +63,7 @@ The HDFS2 component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *jAASConfiguration* (common) | To use the given configuration for security with JAAS. |  | Configuration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -92,7 +93,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (38 parameters):
+==== Query Parameters (39 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -112,6 +113,7 @@ with the following path and query parameters:
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
 | *append* (producer) | Append to existing file. Notice that not all HDFS file systems support the append option. | false | boolean
 | *overwrite* (producer) | Whether to overwrite existing files with the same name | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *blockSize* (advanced) | The size of the HDFS blocks | 67108864 | long
 | *bufferSize* (advanced) | The buffer size used by HDFS | 4096 | int
 | *checkIdleInterval* (advanced) | How often (time in millis) in to run the idle checker background task. This option is only in use if the splitter strategy is IDLE. | 500 | int
@@ -154,13 +156,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hdfs2.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hdfs2.enabled* | Enable hdfs2 component | true | Boolean
 | *camel.component.hdfs2.j-a-a-s-configuration* | To use the given configuration for security with JAAS. The option is a javax.security.auth.login.Configuration type. |  | String
 | *camel.component.hdfs2.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-hipchat/src/main/docs/hipchat-component.adoc b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
index 01ab652..3e7c99f 100644
--- a/components/camel-hipchat/src/main/docs/hipchat-component.adoc
+++ b/components/camel-hipchat/src/main/docs/hipchat-component.adoc
@@ -27,7 +27,16 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The Hipchat component has no options.
+The Hipchat component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -56,7 +65,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (22 parameters):
+==== Query Parameters (23 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -70,6 +79,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -102,13 +112,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.hipchat.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.hipchat.enabled* | Enable hipchat component | true | Boolean
 | *camel.component.hipchat.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-http4/src/main/docs/http4-component.adoc b/components/camel-http4/src/main/docs/http4-component.adoc
index 7140f2f..e9d4581 100644
--- a/components/camel-http4/src/main/docs/http4-component.adoc
+++ b/components/camel-http4/src/main/docs/http4-component.adoc
@@ -52,7 +52,7 @@ route, use the <<jetty-component,Jetty Component>> instead.
 
 
 // component options: START
-The HTTP4 component supports 18 options, which are listed below.
+The HTTP4 component supports 19 options, which are listed below.
 
 
 
@@ -77,6 +77,7 @@ The HTTP4 component supports 18 options, which are listed below.
 | *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -108,7 +109,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (49 parameters):
+==== Query Parameters (50 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -133,6 +134,7 @@ with the following path and query parameters:
 | *cookieHandler* (producer) | Configure a cookie handler to maintain a HTTP session |  | CookieHandler
 | *okStatusCodeRange* (producer) | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | 200-299 | String
 | *urlRewrite* (producer) | *Deprecated* Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html |  | UrlRewrite
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *clientBuilder* (advanced) | Provide access to the http client request parameters used on new RequestConfig instances used by producers or consumers of this endpoint. |  | HttpClientBuilder
 | *clientConnectionManager* (advanced) | To use a custom HttpClientConnectionManager to manage connections |  | HttpClientConnection Manager
 | *connectionsPerRoute* (advanced) | The maximum number of connections per route. | 20 | int
@@ -181,7 +183,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 19 options, which are listed below.
+The component supports 20 options, which are listed below.
 
 
 
@@ -189,6 +191,7 @@ The component supports 19 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.http4.allow-java-serialized-object* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | Boolean
+| *camel.component.http4.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.http4.client-connection-manager* | To use a custom and shared HttpClientConnectionManager to manage connections. If this has been configured then this is always used for all endpoints created by this component. The option is a org.apache.http.conn.HttpClientConnectionManager type. |  | String
 | *camel.component.http4.connect-timeout* | Determines the timeout in milliseconds until a connection is established. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | Integer
 | *camel.component.http4.connection-request-timeout* | The timeout in milliseconds used when requesting a connection from the connection manager. A timeout value of zero is interpreted as an infinite timeout. A timeout value of zero is interpreted as an infinite timeout. A negative value is interpreted as undefined (system default). Default: -1 | -1 | Integer
diff --git a/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc b/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
index 263040d..0573633 100644
--- a/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
+++ b/components/camel-iec60870/src/main/docs/iec60870-client-component.adoc
@@ -20,7 +20,7 @@ for this component:
 ----
 
 // component options: START
-The IEC 60870 Client component supports 2 options, which are listed below.
+The IEC 60870 Client component supports 3 options, which are listed below.
 
 
 
@@ -29,6 +29,7 @@ The IEC 60870 Client component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *defaultConnection Options* (common) | Default connection options |  | ClientOptions
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -71,7 +72,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (19 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -82,6 +83,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *acknowledgeWindow* (connection) | Parameter W - Acknowledgment window. | 10 | short
 | *adsuAddressType* (connection) | The common ASDU address size. May be either SIZE_1 or SIZE_2. |  | ASDUAddressType
@@ -114,13 +116,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.iec60870-client.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.iec60870-client.default-connection-options.cause-source-address* | Whether to include the source address |  | Byte
 | *camel.component.iec60870-client.default-connection-options.data-module-options* | Whether to include the source address |  | DataModuleOptions
 | *camel.component.iec60870-client.default-connection-options.ignore-background-scan* | Whether to include the source address | true | Boolean
diff --git a/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc b/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc
index 76c8ef8..fbf7e29 100644
--- a/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc
+++ b/components/camel-iec60870/src/main/docs/iec60870-server-component.adoc
@@ -21,7 +21,7 @@ for this component:
 
 
 // component options: START
-The IEC 60870 Server component supports 2 options, which are listed below.
+The IEC 60870 Server component supports 3 options, which are listed below.
 
 
 
@@ -30,6 +30,7 @@ The IEC 60870 Server component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *defaultConnection Options* (common) | Default connection options |  | ServerOptions
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -74,7 +75,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -86,6 +87,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *acknowledgeWindow* (connection) | Parameter W - Acknowledgment window. | 10 | short
 | *adsuAddressType* (connection) | The common ASDU address size. May be either SIZE_1 or SIZE_2. |  | ASDUAddressType
@@ -118,13 +120,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 8 options, which are listed below.
+The component supports 9 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.iec60870-server.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.iec60870-server.default-connection-options.background-scan-period* | The period in "ms" between background transmission cycles. <p> If this is set to zero or less, background transmissions will be disabled. </p> |  | Integer
 | *camel.component.iec60870-server.default-connection-options.booleans-with-timestamp* | The period in "ms" between background transmission cycles. <p> If this is set to zero or less, background transmissions will be disabled. </p> |  | Boolean
 | *camel.component.iec60870-server.default-connection-options.buffering-period* | The period in "ms" between background transmission cycles. <p> If this is set to zero or less, background transmissions will be disabled. </p> |  | Integer
diff --git a/components/camel-ignite/src/main/docs/ignite-cache-component.adoc b/components/camel-ignite/src/main/docs/ignite-cache-component.adoc
index 11afdec..1e7d79c 100644
--- a/components/camel-ignite/src/main/docs/ignite-cache-component.adoc
+++ b/components/camel-ignite/src/main/docs/ignite-cache-component.adoc
@@ -13,7 +13,7 @@ Even if you configure a fixed operation in the endpoint URI, you can vary it per
 ### Options
 
 // component options: START
-The Ignite Cache component supports 4 options, which are listed below.
+The Ignite Cache component supports 5 options, which are listed below.
 
 
 
@@ -24,6 +24,7 @@ The Ignite Cache component supports 4 options, which are listed below.
 | *configurationResource* (common) | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. |  | Object
 | *igniteConfiguration* (common) | Allows the user to set a programmatic IgniteConfiguration. |  | IgniteConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -46,7 +47,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (16 parameters):
+==== Query Parameters (17 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -67,6 +68,7 @@ with the following path and query parameters:
 | *cachePeekMode* (producer) | The CachePeekMode, only needed for operations that require it (IgniteCacheOperation#SIZE). | ALL | CachePeekMode
 | *failIfInexistentCache* (producer) | Whether to fail the initialization if the cache doesn't exist. | false | boolean
 | *operation* (producer) | The cache operation to invoke. Possible values: GET, PUT, REMOVE, SIZE, REBALANCE, QUERY, CLEAR. |  | IgniteCacheOperation
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -86,13 +88,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ignite-cache.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ignite-cache.configuration-resource* | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. The option is a java.lang.Object type. |  | String
 | *camel.component.ignite-cache.enabled* | Enable ignite-cache component | true | Boolean
 | *camel.component.ignite-cache.ignite* | Sets the Ignite instance. The option is a org.apache.ignite.Ignite type. |  | String
diff --git a/components/camel-ignite/src/main/docs/ignite-compute-component.adoc b/components/camel-ignite/src/main/docs/ignite-compute-component.adoc
index 017cf65..f238ad6 100644
--- a/components/camel-ignite/src/main/docs/ignite-compute-component.adoc
+++ b/components/camel-ignite/src/main/docs/ignite-compute-component.adoc
@@ -14,7 +14,7 @@ The endpoint tries to run the object passed in the body of the IN message as the
 ### Options
 
 // component options: START
-The Ignite Compute component supports 4 options, which are listed below.
+The Ignite Compute component supports 5 options, which are listed below.
 
 
 
@@ -25,6 +25,7 @@ The Ignite Compute component supports 4 options, which are listed below.
 | *configurationResource* (producer) | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. |  | Object
 | *igniteConfiguration* (producer) | Allows the user to set a programmatic IgniteConfiguration. |  | IgniteConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -47,7 +48,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -60,6 +61,7 @@ with the following path and query parameters:
 | *taskName* (producer) | The task name, only applicable if using the IgniteComputeExecutionType#EXECUTE execution type. |  | String
 | *timeoutMillis* (producer) | The timeout interval for triggered jobs, in milliseconds, which will be set via IgniteCompute#withTimeout(long). |  | Long
 | *treatCollectionsAsCache Objects* (producer) | Sets whether to treat Collections as cache objects or as Collections of items to insert/update/compute, etc. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -79,13 +81,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ignite-compute.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ignite-compute.configuration-resource* | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. The option is a java.lang.Object type. |  | String
 | *camel.component.ignite-compute.enabled* | Enable ignite-compute component | true | Boolean
 | *camel.component.ignite-compute.ignite* | Sets the Ignite instance. The option is a org.apache.ignite.Ignite type. |  | String
diff --git a/components/camel-ignite/src/main/docs/ignite-events-component.adoc b/components/camel-ignite/src/main/docs/ignite-events-component.adoc
index c7ddffb..52459d0 100644
--- a/components/camel-ignite/src/main/docs/ignite-events-component.adoc
+++ b/components/camel-ignite/src/main/docs/ignite-events-component.adoc
@@ -11,7 +11,7 @@ The Exchanges created by this consumer put the received Event object into the bo
 ### Options
 
 // component options: START
-The Ignite Events component supports 4 options, which are listed below.
+The Ignite Events component supports 5 options, which are listed below.
 
 
 
@@ -22,6 +22,7 @@ The Ignite Events component supports 4 options, which are listed below.
 | *configurationResource* (consumer) | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. |  | Object
 | *igniteConfiguration* (consumer) | Allows the user to set a programmatic IgniteConfiguration. |  | IgniteConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -44,7 +45,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -57,6 +58,7 @@ with the following path and query parameters:
 | *treatCollectionsAsCache Objects* (consumer) | Sets whether to treat Collections as cache objects or as Collections of items to insert/update/compute, etc. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -76,13 +78,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ignite-events.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ignite-events.configuration-resource* | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. The option is a java.lang.Object type. |  | String
 | *camel.component.ignite-events.enabled* | Enable ignite-events component | true | Boolean
 | *camel.component.ignite-events.ignite* | Sets the Ignite instance. The option is a org.apache.ignite.Ignite type. |  | String
diff --git a/components/camel-ignite/src/main/docs/ignite-idgen-component.adoc b/components/camel-ignite/src/main/docs/ignite-idgen-component.adoc
index e56d086..bc86f96 100644
--- a/components/camel-ignite/src/main/docs/ignite-idgen-component.adoc
+++ b/components/camel-ignite/src/main/docs/ignite-idgen-component.adoc
@@ -10,7 +10,7 @@ This endpoint only supports producers.
 ### Options
 
 // component options: START
-The Ignite ID Generator component supports 4 options, which are listed below.
+The Ignite ID Generator component supports 5 options, which are listed below.
 
 
 
@@ -21,6 +21,7 @@ The Ignite ID Generator component supports 4 options, which are listed below.
 | *configurationResource* (producer) | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. |  | Object
 | *igniteConfiguration* (producer) | Allows the user to set a programmatic IgniteConfiguration. |  | IgniteConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -43,7 +44,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (6 parameters):
+==== Query Parameters (7 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -54,6 +55,7 @@ with the following path and query parameters:
 | *operation* (producer) | The operation to invoke on the Ignite ID Generator. Superseded by the IgniteConstants.IGNITE_IDGEN_OPERATION header in the IN message. Possible values: ADD_AND_GET, GET, GET_AND_ADD, GET_AND_INCREMENT, INCREMENT_AND_GET. |  | IgniteIdGenOperation
 | *propagateIncomingBodyIfNo ReturnValue* (producer) | Sets whether to propagate the incoming body if the return type of the underlying Ignite operation is void. | true | boolean
 | *treatCollectionsAsCache Objects* (producer) | Sets whether to treat Collections as cache objects or as Collections of items to insert/update/compute, etc. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -73,13 +75,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ignite-idgen.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ignite-idgen.configuration-resource* | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. The option is a java.lang.Object type. |  | String
 | *camel.component.ignite-idgen.enabled* | Enable ignite-idgen component | true | Boolean
 | *camel.component.ignite-idgen.ignite* | Sets the Ignite instance. The option is a org.apache.ignite.Ignite type. |  | String
diff --git a/components/camel-ignite/src/main/docs/ignite-messaging-component.adoc b/components/camel-ignite/src/main/docs/ignite-messaging-component.adoc
index 737f2ba..a26d0e7 100644
--- a/components/camel-ignite/src/main/docs/ignite-messaging-component.adoc
+++ b/components/camel-ignite/src/main/docs/ignite-messaging-component.adoc
@@ -10,7 +10,7 @@ This endpoint supports producers (to send messages) and consumers (to receive me
 ### Options
 
 // component options: START
-The Ignite Messaging component supports 4 options, which are listed below.
+The Ignite Messaging component supports 5 options, which are listed below.
 
 
 
@@ -21,6 +21,7 @@ The Ignite Messaging component supports 4 options, which are listed below.
 | *configurationResource* (common) | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. |  | Object
 | *igniteConfiguration* (common) | Allows the user to set a programmatic IgniteConfiguration. |  | IgniteConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -43,7 +44,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (9 parameters):
+==== Query Parameters (10 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -57,6 +58,7 @@ with the following path and query parameters:
 | *clusterGroupExpression* (producer) | The cluster group expression. |  | ClusterGroupExpression
 | *sendMode* (producer) | The send mode to use. Possible values: UNORDERED, ORDERED. | UNORDERED | IgniteMessagingSend Mode
 | *timeout* (producer) | The timeout for the send operation when using ordered messages. |  | Long
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -76,13 +78,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ignite-messaging.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ignite-messaging.configuration-resource* | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. The option is a java.lang.Object type. |  | String
 | *camel.component.ignite-messaging.enabled* | Enable ignite-messaging component | true | Boolean
 | *camel.component.ignite-messaging.ignite* | Sets the Ignite instance. The option is a org.apache.ignite.Ignite type. |  | String
diff --git a/components/camel-ignite/src/main/docs/ignite-queue-component.adoc b/components/camel-ignite/src/main/docs/ignite-queue-component.adoc
index e794d3b..0c390b0 100644
--- a/components/camel-ignite/src/main/docs/ignite-queue-component.adoc
+++ b/components/camel-ignite/src/main/docs/ignite-queue-component.adoc
@@ -10,7 +10,7 @@ This endpoint only supports producers.
 ### Options
 
 // component options: START
-The Ignite Queues component supports 4 options, which are listed below.
+The Ignite Queues component supports 5 options, which are listed below.
 
 
 
@@ -21,6 +21,7 @@ The Ignite Queues component supports 4 options, which are listed below.
 | *configurationResource* (producer) | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. |  | Object
 | *igniteConfiguration* (producer) | Allows the user to set a programmatic IgniteConfiguration. |  | IgniteConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -43,7 +44,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (7 parameters):
+==== Query Parameters (8 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -55,6 +56,7 @@ with the following path and query parameters:
 | *propagateIncomingBodyIfNo ReturnValue* (producer) | Sets whether to propagate the incoming body if the return type of the underlying Ignite operation is void. | true | boolean
 | *timeoutMillis* (producer) | The queue timeout in milliseconds. Default: no timeout. |  | Long
 | *treatCollectionsAsCache Objects* (producer) | Sets whether to treat Collections as cache objects or as Collections of items to insert/update/compute, etc. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -74,13 +76,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ignite-queue.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ignite-queue.configuration-resource* | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. The option is a java.lang.Object type. |  | String
 | *camel.component.ignite-queue.enabled* | Enable ignite-queue component | true | Boolean
 | *camel.component.ignite-queue.ignite* | Sets the Ignite instance. The option is a org.apache.ignite.Ignite type. |  | String
diff --git a/components/camel-ignite/src/main/docs/ignite-set-component.adoc b/components/camel-ignite/src/main/docs/ignite-set-component.adoc
index 8906e58..420a667 100644
--- a/components/camel-ignite/src/main/docs/ignite-set-component.adoc
+++ b/components/camel-ignite/src/main/docs/ignite-set-component.adoc
@@ -10,7 +10,7 @@ This endpoint only supports producers.
 ### Options
 
 // component options: START
-The Ignite Sets component supports 4 options, which are listed below.
+The Ignite Sets component supports 5 options, which are listed below.
 
 
 
@@ -21,6 +21,7 @@ The Ignite Sets component supports 4 options, which are listed below.
 | *configurationResource* (producer) | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. |  | Object
 | *igniteConfiguration* (producer) | Allows the user to set a programmatic IgniteConfiguration. |  | IgniteConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -43,7 +44,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (5 parameters):
+==== Query Parameters (6 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -53,6 +54,7 @@ with the following path and query parameters:
 | *operation* (producer) | The operation to invoke on the Ignite Set. Superseded by the IgniteConstants.IGNITE_SETS_OPERATION header in the IN message. Possible values: CONTAINS, ADD, SIZE, REMOVE, ITERATOR, CLEAR, RETAIN_ALL, ARRAY.The set operation to perform. |  | IgniteSetOperation
 | *propagateIncomingBodyIfNo ReturnValue* (producer) | Sets whether to propagate the incoming body if the return type of the underlying Ignite operation is void. | true | boolean
 | *treatCollectionsAsCache Objects* (producer) | Sets whether to treat Collections as cache objects or as Collections of items to insert/update/compute, etc. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -72,13 +74,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ignite-set.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ignite-set.configuration-resource* | Sets the resource from where to load the configuration. It can be a: URI, String (URI) or an InputStream. The option is a java.lang.Object type. |  | String
 | *camel.component.ignite-set.enabled* | Enable ignite-set component | true | Boolean
 | *camel.component.ignite-set.ignite* | Sets the Ignite instance. The option is a org.apache.ignite.Ignite type. |  | String
diff --git a/components/camel-infinispan/src/main/docs/infinispan-component.adoc b/components/camel-infinispan/src/main/docs/infinispan-component.adoc
index 9b8df1e..e8a3d83 100644
--- a/components/camel-infinispan/src/main/docs/infinispan-component.adoc
+++ b/components/camel-infinispan/src/main/docs/infinispan-component.adoc
@@ -39,7 +39,7 @@ accessible from the registry.
 
 
 // component options: START
-The Infinispan component supports 3 options, which are listed below.
+The Infinispan component supports 4 options, which are listed below.
 
 
 
@@ -49,6 +49,7 @@ The Infinispan component supports 3 options, which are listed below.
 | *configuration* (common) | The default configuration shared among endpoints. |  | InfinispanConfiguration
 | *cacheContainer* (common) | The default cache container. |  | BasicCacheContainer
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -74,7 +75,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (19 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -91,6 +92,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *operation* (producer) | The operation to perform. | PUT | InfinispanOperation
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *cacheContainer* (advanced) | Specifies the cache Container to connect |  | BasicCacheContainer
 | *cacheContainerConfiguration* (advanced) | The CacheContainer configuration. Uses if the cacheContainer is not defined. Must be the following types: org.infinispan.client.hotrod.configuration.Configuration - for remote cache interaction configuration; org.infinispan.configuration.cache.Configuration - for embedded cache interaction configuration; |  | Object
 | *configurationProperties* (advanced) | Implementation specific properties for the CacheManager |  | Map
@@ -117,13 +119,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 22 options, which are listed below.
+The component supports 23 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.infinispan.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.infinispan.cache-container* | The default cache container. The option is a org.infinispan.commons.api.BasicCacheContainer type. |  | String
 | *camel.component.infinispan.configuration.cache-container* | Specifies the cache Container to connect |  | BasicCacheContainer
 | *camel.component.infinispan.configuration.cache-container-configuration* | The CacheContainer configuration. Uses if the cacheContainer is not defined. Must be the following types: org.infinispan.client.hotrod.configuration.Configuration - for remote cache interaction configuration; org.infinispan.configuration.cache.Configuration - for embedded cache interaction configuration; |  | Object
diff --git a/components/camel-influxdb/src/main/docs/influxdb-component.adoc b/components/camel-influxdb/src/main/docs/influxdb-component.adoc
index 98abaa8..3d0c015 100644
--- a/components/camel-influxdb/src/main/docs/influxdb-component.adoc
+++ b/components/camel-influxdb/src/main/docs/influxdb-component.adoc
@@ -42,7 +42,16 @@ configured in the registry, using the native java driver.
 
 
 // component options: START
-The InfluxDB component has no options.
+The InfluxDB component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -67,7 +76,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (6 parameters):
+==== Query Parameters (7 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -78,6 +87,7 @@ with the following path and query parameters:
 | *operation* (producer) | Define if this operation is an insert or a query | insert | String
 | *query* (producer) | Define the query in case of operation query |  | String
 | *retentionPolicy* (producer) | The string that defines the retention policy to the data created by the endpoint | default | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -97,13 +107,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.influxdb.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.influxdb.enabled* | Enable influxdb component | true | Boolean
 | *camel.component.influxdb.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-iota/src/main/docs/iota-component.adoc b/components/camel-iota/src/main/docs/iota-component.adoc
index f6b5829..b3f451b 100644
--- a/components/camel-iota/src/main/docs/iota-component.adoc
+++ b/components/camel-iota/src/main/docs/iota-component.adoc
@@ -28,7 +28,16 @@ iota:name?url=nodeurl[&moreOptions...]
 === Options
 
 // component options: START
-The IOTA component has no options.
+The IOTA component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -50,7 +59,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (10 parameters):
+==== Query Parameters (11 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -65,6 +74,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -85,13 +95,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.iota.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.iota.enabled* | Whether to enable auto configuration of the iota component. This is enabled by default. |  | Boolean
 | *camel.component.iota.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-ipfs/src/main/docs/ipfs-component.adoc b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
index 586feda..aa3ad0d 100644
--- a/components/camel-ipfs/src/main/docs/ipfs-component.adoc
+++ b/components/camel-ipfs/src/main/docs/ipfs-component.adoc
@@ -28,7 +28,16 @@ ipfs://cmd?options
 ### Options
 
 // component options: START
-The IPFS component has no options.
+The IPFS component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -50,13 +59,14 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (2 parameters):
+==== Query Parameters (3 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *outdir* (producer) | The ipfs output directory |  | Path
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -76,13 +86,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ipfs.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ipfs.enabled* | Whether to enable auto configuration of the ipfs component. This is enabled by default. |  | Boolean
 | *camel.component.ipfs.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-irc/src/main/docs/irc-component.adoc b/components/camel-irc/src/main/docs/irc-component.adoc
index c025fad..46e3a49 100644
--- a/components/camel-irc/src/main/docs/irc-component.adoc
+++ b/components/camel-irc/src/main/docs/irc-component.adoc
@@ -35,7 +35,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The IRC component supports 2 options, which are listed below.
+The IRC component supports 3 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The IRC component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -73,7 +74,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (25 parameters):
+==== Query Parameters (26 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -88,6 +89,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *colors* (advanced) | Whether or not the server supports color codes. | true | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *onJoin* (filter) | Handle user join events. | true | boolean
@@ -122,13 +124,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.irc.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.irc.enabled* | Enable irc component | true | Boolean
 | *camel.component.irc.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 | *camel.component.irc.use-global-ssl-context-parameters* | Enable usage of global SSL context parameters. | false | Boolean
diff --git a/components/camel-ironmq/src/main/docs/ironmq-component.adoc b/components/camel-ironmq/src/main/docs/ironmq-component.adoc
index 280fdd5..c8f1219 100644
--- a/components/camel-ironmq/src/main/docs/ironmq-component.adoc
+++ b/components/camel-ironmq/src/main/docs/ironmq-component.adoc
@@ -59,7 +59,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (30 parameters):
+==== Query Parameters (31 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -81,6 +81,7 @@ with the following path and query parameters:
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
 | *visibilityDelay* (producer) | The item will not be available on the queue until this many seconds have passed. Default is 0 seconds. |  | int
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -113,13 +114,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.ironmq.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ironmq.enabled* | Enable ironmq component | true | Boolean
 | *camel.component.ironmq.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
@@ -137,7 +139,16 @@ The component supports 2 options, which are listed below.
 
 
 // component options: START
-The IronMQ component has no options.
+The IronMQ component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
diff --git a/components/camel-jbpm/src/main/docs/jbpm-component.adoc b/components/camel-jbpm/src/main/docs/jbpm-component.adoc
index ab2e0b4..0bb85de 100644
--- a/components/camel-jbpm/src/main/docs/jbpm-component.adoc
+++ b/components/camel-jbpm/src/main/docs/jbpm-component.adoc
@@ -136,7 +136,16 @@ jbpm::hostName[:port][/resourceUri][?options]
 
 
 // component options: START
-The JBPM component has no options.
+The JBPM component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -163,7 +172,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (30 parameters):
+==== Query Parameters (31 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -192,6 +201,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *operation* (producer) | The operation to perform | startProcess | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *entities* (advanced) | The potentialOwners when nominateTask operation is performed |  | List
 | *extraJaxbClasses* (advanced) | To load additional classes when working with XML |  | Class[]
 | *parameters* (advanced) | the variables that should be set for various operations |  | Map
@@ -217,13 +227,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jbpm.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jbpm.enabled* | Enable jbpm component | true | Boolean
 | *camel.component.jbpm.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-jcache/src/main/docs/jcache-component.adoc b/components/camel-jcache/src/main/docs/jcache-component.adoc
index a018a7d..a1d0c5f 100644
--- a/components/camel-jcache/src/main/docs/jcache-component.adoc
+++ b/components/camel-jcache/src/main/docs/jcache-component.adoc
@@ -33,7 +33,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (22 parameters):
+==== Query Parameters (23 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -56,6 +56,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *action* (producer) | To configure using a cache operation by default. If an operation in the message header, then the operation from the header takes precedence. |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *cacheLoaderFactory* (advanced) | The CacheLoader factory |  | Factory
 | *cacheWriterFactory* (advanced) | The CacheWriter factory |  | Factory
 | *createCacheIfNotExists* (advanced) | Configure if a cache need to be created if it does exist or can't be pre-configured. | true | boolean
@@ -79,13 +80,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jcache.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jcache.cache-configuration* | A Configuration for the Cache. The option is a javax.cache.configuration.Configuration type. |  | String
 | *camel.component.jcache.cache-configuration-properties* | The Properties for the javax.cache.spi.CachingProvider to create the CacheManager. The option is a java.util.Properties type. |  | String
 | *camel.component.jcache.caching-provider* | The fully qualified class name of the javax.cache.spi.CachingProvider |  | String
@@ -104,7 +106,7 @@ The component supports 6 options, which are listed below.
 
 
 // component options: START
-The JCache component supports 5 options, which are listed below.
+The JCache component supports 6 options, which are listed below.
 
 
 
@@ -116,6 +118,7 @@ The JCache component supports 5 options, which are listed below.
 | *cacheConfiguration Properties* (common) | The Properties for the javax.cache.spi.CachingProvider to create the CacheManager |  | Properties
 | *configurationUri* (common) | An implementation specific URI for the CacheManager |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
diff --git a/components/camel-jclouds/src/main/docs/jclouds-component.adoc b/components/camel-jclouds/src/main/docs/jclouds-component.adoc
index 6ba3c22..051fbdb 100644
--- a/components/camel-jclouds/src/main/docs/jclouds-component.adoc
+++ b/components/camel-jclouds/src/main/docs/jclouds-component.adoc
@@ -103,7 +103,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The JClouds component supports 3 options, which are listed below.
+The JClouds component supports 4 options, which are listed below.
 
 
 
@@ -113,6 +113,7 @@ The JClouds component supports 3 options, which are listed below.
 | *blobStores* (common) | To use the given BlobStore which must be configured when using blobstore. |  | List
 | *computeServices* (common) | To use the given ComputeService which must be configured when use compute. |  | List
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -141,7 +142,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (15 parameters):
+==== Query Parameters (16 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -150,6 +151,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *blobName* (blobstore) | The name of the blob. |  | String
 | *container* (blobstore) | The name of the blob container. |  | String
@@ -194,13 +196,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 4 options, which are listed below.
+The component supports 5 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jclouds.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jclouds.blob-stores* | To use the given BlobStore which must be configured when using blobstore. |  | List
 | *camel.component.jclouds.compute-services* | To use the given ComputeService which must be configured when use compute. |  | List
 | *camel.component.jclouds.enabled* | Whether to enable auto configuration of the jclouds component. This is enabled by default. |  | Boolean
diff --git a/components/camel-jcr/src/main/docs/jcr-component.adoc b/components/camel-jcr/src/main/docs/jcr-component.adoc
index fdcaa2e..272ee90 100644
--- a/components/camel-jcr/src/main/docs/jcr-component.adoc
+++ b/components/camel-jcr/src/main/docs/jcr-component.adoc
@@ -42,7 +42,16 @@ The `repository` element of the URI is used to look up the JCR
 
 
 // component options: START
-The JCR component has no options.
+The JCR component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -68,7 +77,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (14 parameters):
+==== Query Parameters (15 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -87,6 +96,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -106,13 +116,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jcr.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jcr.enabled* | Enable jcr component | true | Boolean
 | *camel.component.jcr.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-jdbc/src/main/docs/jdbc-component.adoc b/components/camel-jdbc/src/main/docs/jdbc-component.adoc
index b6e54cf..e7db903 100644
--- a/components/camel-jdbc/src/main/docs/jdbc-component.adoc
+++ b/components/camel-jdbc/src/main/docs/jdbc-component.adoc
@@ -40,7 +40,7 @@ You can append query options to the URI in the following format,
 === Options
 
 // component options: START
-The JDBC component supports 2 options, which are listed below.
+The JDBC component supports 3 options, which are listed below.
 
 
 
@@ -49,6 +49,7 @@ The JDBC component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *dataSource* (producer) | To use the DataSource instance instead of looking up the data source by name from the registry. |  | DataSource
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -76,7 +77,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -92,6 +93,7 @@ with the following path and query parameters:
 | *useGetBytesForBlob* (producer) | To read BLOB columns as bytes instead of string data. This may be needed for certain databases such as Oracle where you must read BLOB columns as bytes. | false | boolean
 | *useHeadersAsParameters* (producer) | Set this option to true to use the prepareStatementStrategy with named parameters. This allows to define queries with named placeholders, and use headers with the dynamic values for the query placeholders. | false | boolean
 | *useJDBC4ColumnNameAnd LabelSemantics* (producer) | Sets whether to use JDBC 4 or JDBC 3.0 or older semantic when retrieving column name. JDBC 4.0 uses columnLabel to get the column name where as JDBC 3.0 uses both columnName or columnLabel. Unfortunately JDBC drivers behave differently so you can use this option to work out issues around your JDBC driver if you get problem using this component This option is default true. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *beanRowMapper* (advanced) | To use a custom org.apache.camel.component.jdbc.BeanRowMapper when using outputClass. The default implementation will lower case the row names and skip underscores, and dashes. For example CUST_ID is mapped as custId. |  | BeanRowMapper
 | *prepareStatementStrategy* (advanced) | Allows to plugin to use a custom org.apache.camel.component.jdbc.JdbcPrepareStatementStrategy to control preparation of the query and prepared statement. |  | JdbcPrepareStatement Strategy
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
@@ -114,13 +116,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jdbc.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jdbc.data-source* | To use the DataSource instance instead of looking up the data source by name from the registry. The option is a javax.sql.DataSource type. |  | String
 | *camel.component.jdbc.enabled* | Enable jdbc component | true | Boolean
 | *camel.component.jdbc.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-jetty/src/main/docs/jetty-component.adoc b/components/camel-jetty/src/main/docs/jetty-component.adoc
index 2924dc9..ce80b40 100644
--- a/components/camel-jetty/src/main/docs/jetty-component.adoc
+++ b/components/camel-jetty/src/main/docs/jetty-component.adoc
@@ -53,7 +53,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The Jetty component supports 33 options, which are listed below.
+The Jetty component supports 34 options, which are listed below.
 
 
 
@@ -93,6 +93,7 @@ The Jetty component supports 33 options, which are listed below.
 | *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -123,7 +124,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (54 parameters):
+==== Query Parameters (55 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -174,6 +175,7 @@ with the following path and query parameters:
 | *jettyBindingRef* (producer) | *Deprecated* To use a custom JettyHttpBinding which be used to customize how a response should be written for the producer. |  | String
 | *okStatusCodeRange* (producer) | The status codes which are considered a success response. The values are inclusive. Multiple ranges can be defined, separated by comma, e.g. 200-204,209,301-304. Each range must be a single number or from-to with the dash included. | 200-299 | String
 | *urlRewrite* (producer) | *Deprecated* Refers to a custom org.apache.camel.component.http.UrlRewrite which allows you to rewrite urls when you bridge/proxy endpoints. See more details at http://camel.apache.org/urlrewrite.html |  | UrlRewrite
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *mapHttpMessageBody* (advanced) | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping. | true | boolean
 | *mapHttpMessageFormUrl EncodedBody* (advanced) | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping. | true | boolean
 | *mapHttpMessageHeaders* (advanced) | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping. | true | boolean
@@ -201,7 +203,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 34 options, which are listed below.
+The component supports 35 options, which are listed below.
 
 
 
@@ -209,6 +211,7 @@ The component supports 34 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.jetty.allow-java-serialized-object* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | Boolean
+| *camel.component.jetty.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jetty.continuation-timeout* | Allows to set a timeout in millis when using Jetty as consumer (server). By default Jetty uses 30000. You can use a value of = 0 to never expire. If a timeout occurs then the request will be expired and Jetty will return back a http error 503 to the client. This option is only in use when using Jetty with the Asynchronous Routing Engine. | 30000 | Long
 | *camel.component.jetty.enable-jmx* | If this option is true, Jetty JMX support will be enabled for this endpoint. | false | Boolean
 | *camel.component.jetty.enabled* | Whether to enable auto configuration of the jetty component. This is enabled by default. |  | Boolean
diff --git a/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc b/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc
index 9af5b53..366e98b 100644
--- a/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc
+++ b/components/camel-jgroups-raft/src/main/docs/jgroups-raft-component.adoc
@@ -32,7 +32,7 @@ component should connect to.
 ### Options
 
 // component options: START
-The JGroups raft component supports 5 options, which are listed below.
+The JGroups raft component supports 6 options, which are listed below.
 
 
 
@@ -44,6 +44,7 @@ The JGroups raft component supports 5 options, which are listed below.
 | *raftId* (common) | *Required* Unique raftId to use. |  | String
 | *channelProperties* (common) | Specifies configuration properties of the RaftHandle JChannel used by the endpoint (ignored if raftHandle ref is provided). | raft.xml | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -66,7 +67,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (5 parameters):
+==== Query Parameters (6 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +77,7 @@ with the following path and query parameters:
 | *enableRoleChangeEvents* (consumer) | If set to true, the consumer endpoint will receive roleChange event as well (not just connecting and/or using the state machine). By default it is set to false. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -96,13 +98,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 11 options, which are listed below.
+The component supports 12 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jgroups-raft.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jgroups-raft.channel-properties* | Specifies configuration properties of the RaftHandle JChannel used by the endpoint (ignored if raftHandle ref is provided). | raft.xml | String
 | *camel.component.jgroups-raft.enabled* | Enable jgroups-raft component | true | Boolean
 | *camel.component.jgroups-raft.raft-handle* | RaftHandle to use. The option is a org.jgroups.raft.RaftHandle type. |  | String
diff --git a/components/camel-jgroups/src/main/docs/jgroups-component.adoc b/components/camel-jgroups/src/main/docs/jgroups-component.adoc
index 873901f..2e77f8c 100644
--- a/components/camel-jgroups/src/main/docs/jgroups-component.adoc
+++ b/components/camel-jgroups/src/main/docs/jgroups-component.adoc
@@ -50,7 +50,7 @@ component should connect to.
 
 
 // component options: START
-The JGroups component supports 4 options, which are listed below.
+The JGroups component supports 5 options, which are listed below.
 
 
 
@@ -61,6 +61,7 @@ The JGroups component supports 4 options, which are listed below.
 | *channelProperties* (common) | Specifies configuration properties of the JChannel used by the endpoint. |  | String
 | *enableViewMessages* (consumer) | If set to true, the consumer endpoint will receive org.jgroups.View messages as well (not only org.jgroups.Message instances). By default only regular messages are consumed by the endpoint. | false | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -88,7 +89,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (6 parameters):
+==== Query Parameters (7 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -99,6 +100,7 @@ with the following path and query parameters:
 | *enableViewMessages* (consumer) | If set to true, the consumer endpoint will receive org.jgroups.View messages as well (not only org.jgroups.Message instances). By default only regular messages are consumed by the endpoint. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -118,13 +120,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jgroups.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jgroups.channel* | Channel to use. The option is a org.jgroups.JChannel type. |  | String
 | *camel.component.jgroups.channel-properties* | Specifies configuration properties of the JChannel used by the endpoint. |  | String
 | *camel.component.jgroups.enable-view-messages* | If set to true, the consumer endpoint will receive org.jgroups.View messages as well (not only org.jgroups.Message instances). By default only regular messages are consumed by the endpoint. | false | Boolean
diff --git a/components/camel-jing/src/main/docs/jing-component.adoc b/components/camel-jing/src/main/docs/jing-component.adoc
index 4c090e3..8a48347 100644
--- a/components/camel-jing/src/main/docs/jing-component.adoc
+++ b/components/camel-jing/src/main/docs/jing-component.adoc
@@ -41,7 +41,16 @@ option compactSyntax to turn on either RNG or RNC mode.
 
 
 // component options: START
-The Jing component has no options.
+The Jing component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -66,13 +75,14 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (2 parameters):
+==== Query Parameters (3 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
 | *compactSyntax* (producer) | Whether to validate using RelaxNG compact syntax or not. By default this is false for using RelaxNG XML Syntax (rng) And true is for using RelaxNG Compact Syntax (rnc) | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -92,13 +102,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jing.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jing.enabled* | Enable jing component | true | Boolean
 | *camel.component.jing.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-jira/src/main/docs/jira-component.adoc b/components/camel-jira/src/main/docs/jira-component.adoc
index 0efb3c7..8e3618057 100644
--- a/components/camel-jira/src/main/docs/jira-component.adoc
+++ b/components/camel-jira/src/main/docs/jira-component.adoc
@@ -42,7 +42,7 @@ jira://type[?options]
 
 
 // component options: START
-The Jira component supports 2 options, which are listed below.
+The Jira component supports 3 options, which are listed below.
 
 
 
@@ -51,6 +51,7 @@ The Jira component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (advanced) | The JiraConfiguration parameters |  | JiraConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -92,7 +93,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (14 parameters):
+==== Query Parameters (15 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -105,6 +106,7 @@ with the following path and query parameters:
 | *maxResults* (consumer) | Max number of issues to search for | 50 | Integer
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *accessToken* (security) | (OAuth only) The access token generated by the Jira server. |  | String
 | *consumerKey* (security) | (OAuth only) The consumer key from Jira settings. |  | String
@@ -131,13 +133,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 10 options, which are listed below.
+The component supports 11 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jira.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jira.configuration.access-token* | (OAuth only) The access token generated by the Jira server. |  | String
 | *camel.component.jira.configuration.consumer-key* | (OAuth only) The consumer key from Jira settings. |  | String
 | *camel.component.jira.configuration.delay* | Time in milliseconds to elapse for the next poll. | 6000 | Integer
diff --git a/components/camel-jms/src/main/docs/jms-component.adoc b/components/camel-jms/src/main/docs/jms-component.adoc
index 6ab8f20..f53dd10 100644
--- a/components/camel-jms/src/main/docs/jms-component.adoc
+++ b/components/camel-jms/src/main/docs/jms-component.adoc
@@ -196,7 +196,7 @@ about these properties by consulting the relevant Spring documentation.
 
 
 // component options: START
-The JMS component supports 80 options, which are listed below.
+The JMS component supports 81 options, which are listed below.
 
 
 
@@ -283,6 +283,7 @@ The JMS component supports 80 options, which are listed below.
 | *formatDateHeadersTo Iso8601* (producer) | Sets whether date headers should be formatted according to the ISO 8601 standard. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -323,7 +324,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (91 parameters):
+==== Query Parameters (92 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -385,6 +386,7 @@ with the following path and query parameters:
 | *allowSerializedHeaders* (advanced) | Controls whether or not to include serialized headers. Applies only when isTransferExchange() is true. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | boolean
 | *asyncStartListener* (advanced) | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, the [...]
 | *asyncStopListener* (advanced) | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *destinationResolver* (advanced) | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). |  | DestinationResolver
 | *errorHandler* (advanced) | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom errorHandler. [...]
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
@@ -438,7 +440,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 172 options, which are listed below.
+The component supports 173 options, which are listed below.
 
 
 
@@ -456,6 +458,7 @@ The component supports 172 options, which are listed below.
 | *camel.component.jms.async-start-listener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option i [...]
 | *camel.component.jms.async-stop-listener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | Boolean
 | *camel.component.jms.auto-startup* | Specifies whether the consumer container should auto-startup. | true | Boolean
+| *camel.component.jms.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jms.cache-level* | Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details. |  | Integer
 | *camel.component.jms.cache-level-name* | Sets the cache level by name for the underlying JMS resources. Possible values are: CACHE_AUTO, CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default setting is CACHE_AUTO. See the Spring documentation and Transactions Cache Levels for more information. | CACHE_AUTO | String
 | *camel.component.jms.client-id* | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. |  | String
diff --git a/components/camel-jmx/src/main/docs/jmx-component.adoc b/components/camel-jmx/src/main/docs/jmx-component.adoc
index 7b375a8..1e949d9 100644
--- a/components/camel-jmx/src/main/docs/jmx-component.adoc
+++ b/components/camel-jmx/src/main/docs/jmx-component.adoc
@@ -23,7 +23,16 @@ monitor Camel using JMX.
 === Options
 
 // component options: START
-The JMX component has no options.
+The JMX component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -45,7 +54,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (30 parameters):
+==== Query Parameters (31 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -60,6 +69,7 @@ with the following path and query parameters:
 | *observedAttribute* (consumer) | The attribute to observe for the monitor bean or consumer. |  | String
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *executorService* (advanced) | To use a custom shared thread pool for the consumers. By default each consume has their own thread-pool to process and route notifications. |  | ExecutorService
 | *handback* (advanced) | Value to handback to the listener when a notification is received. This value will be put in the message header with the key jmx.handback |  | Object
 | *notificationFilter* (advanced) | Reference to a bean that implements the NotificationFilter. |  | NotificationFilter
@@ -99,13 +109,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jmx.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jmx.enabled* | Enable jmx component | true | Boolean
 | *camel.component.jmx.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-jolt/src/main/docs/jolt-component.adoc b/components/camel-jolt/src/main/docs/jolt-component.adoc
index a9a1d90..bb517e8 100644
--- a/components/camel-jolt/src/main/docs/jolt-component.adoc
+++ b/components/camel-jolt/src/main/docs/jolt-component.adoc
@@ -42,7 +42,7 @@ format, `?option=value&option=value&...`
 
 
 // component options: START
-The JOLT component supports 2 options, which are listed below.
+The JOLT component supports 3 options, which are listed below.
 
 
 
@@ -51,6 +51,7 @@ The JOLT component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *transform* (advanced) | Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created |  | Transform
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -78,7 +79,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (5 parameters):
+==== Query Parameters (6 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -88,6 +89,7 @@ with the following path and query parameters:
 | *inputType* (producer) | Specifies if the input is hydrated JSON or a JSON String. | Hydrated | JoltInputOutputType
 | *outputType* (producer) | Specifies if the output should be hydrated JSON or a JSON String. | Hydrated | JoltInputOutputType
 | *transformDsl* (producer) | Specifies the Transform DSL of the endpoint resource. If none is specified Chainr will be used. | Chainr | JoltTransformType
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -107,13 +109,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jolt.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jolt.enabled* | Enable jolt component | true | Boolean
 | *camel.component.jolt.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 | *camel.component.jolt.transform* | Explicitly sets the Transform to use. If not set a Transform specified by the transformDsl will be created. The option is a com.bazaarvoice.jolt.Transform type. |  | String
diff --git a/components/camel-jooq/src/main/docs/jooq-component.adoc b/components/camel-jooq/src/main/docs/jooq-component.adoc
index f3a5ba4..b0076aa 100644
--- a/components/camel-jooq/src/main/docs/jooq-component.adoc
+++ b/components/camel-jooq/src/main/docs/jooq-component.adoc
@@ -40,7 +40,7 @@ If you do not wish to delete the entity bean when it has been processed, you can
 === Options
 
 // component options: START
-The JOOQ component supports 2 options, which are listed below.
+The JOOQ component supports 3 options, which are listed below.
 
 
 
@@ -49,6 +49,7 @@ The JOOQ component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *configuration* (common) | Component configuration (database connection, database entity type, etc.) |  | JooqConfiguration
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -72,7 +73,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (22 parameters):
+==== Query Parameters (23 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -86,6 +87,7 @@ with the following path and query parameters:
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
 | *operation* (producer) | Type of operation to execute on query | NONE | JooqOperation
 | *query* (producer) | To execute plain SQL query |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -119,13 +121,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 7 options, which are listed below.
+The component supports 8 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jooq.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jooq.configuration.consume-delete* | Delete entity after it is consumed | true | Boolean
 | *camel.component.jooq.configuration.database-configuration* |  |  | Configuration
 | *camel.component.jooq.configuration.entity-type* | JOOQ entity class |  | Class
diff --git a/components/camel-jpa/src/main/docs/jpa-component.adoc b/components/camel-jpa/src/main/docs/jpa-component.adoc
index 88f371a..8636694 100644
--- a/components/camel-jpa/src/main/docs/jpa-component.adoc
+++ b/components/camel-jpa/src/main/docs/jpa-component.adoc
@@ -95,7 +95,7 @@ You can append query options to the URI in the following format,
 
 
 // component options: START
-The JPA component supports 5 options, which are listed below.
+The JPA component supports 6 options, which are listed below.
 
 
 
@@ -107,6 +107,7 @@ The JPA component supports 5 options, which are listed below.
 | *joinTransaction* (common) | The camel-jpa component will join transaction by default. You can use this option to turn this off, for example if you use LOCAL_RESOURCE and join transaction doesn't work with your JPA provider. This option can also be set globally on the JpaComponent, instead of having to set it on all endpoints. | true | boolean
 | *sharedEntityManager* (common) | Whether to use Spring's SharedEntityManager for the consumer/producer. Note in most cases joinTransaction should be set to false as this is not an EXTENDED EntityManager. | false | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -136,7 +137,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (42 parameters):
+==== Query Parameters (43 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -169,6 +170,7 @@ with the following path and query parameters:
 | *useExecuteUpdate* (producer) | To configure whether to use executeUpdate() when producer executes a query. When you use INSERT, UPDATE or DELETE statement as a named query, you need to specify this option to 'true'. |  | Boolean
 | *usePassedInEntityManager* (producer) | If set to true, then Camel will use the EntityManager from the header JpaConstants.ENTITY_MANAGER instead of the configured entity manager on the component/endpoint. This allows end users to control which entity manager will be in use. | false | boolean
 | *usePersist* (producer) | Indicates to use entityManager.persist(entity) instead of entityManager.merge(entity). Note: entityManager.persist(entity) doesn't work for detached entities (where the EntityManager has to execute an UPDATE instead of an INSERT query)! | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *entityManagerProperties* (advanced) | Additional properties for the entity manager to use. |  | Map
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
@@ -202,13 +204,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jpa.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jpa.enabled* | Enable jpa component | true | Boolean
 | *camel.component.jpa.entity-manager-factory* | To use the EntityManagerFactory. This is strongly recommended to configure. The option is a javax.persistence.EntityManagerFactory type. |  | String
 | *camel.component.jpa.join-transaction* | The camel-jpa component will join transaction by default. You can use this option to turn this off, for example if you use LOCAL_RESOURCE and join transaction doesn't work with your JPA provider. This option can also be set globally on the JpaComponent, instead of having to set it on all endpoints. | true | Boolean
diff --git a/components/camel-jsch/src/main/docs/scp-component.adoc b/components/camel-jsch/src/main/docs/scp-component.adoc
index d5bfd99..1bf27c5 100644
--- a/components/camel-jsch/src/main/docs/scp-component.adoc
+++ b/components/camel-jsch/src/main/docs/scp-component.adoc
@@ -42,7 +42,7 @@ in code).
 
 
 // component options: START
-The SCP component supports 2 options, which are listed below.
+The SCP component supports 3 options, which are listed below.
 
 
 
@@ -51,6 +51,7 @@ The SCP component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *verboseLogging* (producer) | JSCH is verbose logging out of the box. Therefore we turn the logging down to DEBUG logging by default. But setting this option to true turns on the verbose logging again. | false | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -83,7 +84,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (22 parameters):
+==== Query Parameters (23 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +99,7 @@ with the following path and query parameters:
 | *allowNullBody* (producer) | Used to specify if a null body is allowed during file writing. If set to true then an empty file will be created, when set to false, and attempting to send a null body to the file component, a GenericFileWriteException of 'Cannot write null body to file.' will be thrown. If the fileExist option is set to 'Override', then the file will be truncated, and if set to append the file will remain unchanged. | false | boolean
 | *disconnectOnBatchComplete* (producer) | Whether or not to disconnect from remote FTP server right after a Batch upload is complete. disconnectOnBatchComplete will only disconnect the current connection to the FTP server. | false | boolean
 | *moveExistingFileStrategy* (producer) | Strategy (Custom Strategy) used to move file with special naming token to use when fileExist=Move is configured. By default, there is an implementation used if no custom strategy is provided |  | FileMoveExisting Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectTimeout* (advanced) | Sets the connect timeout for waiting for a connection to be established Used by both FTPClient and JSCH | 10000 | int
 | *soTimeout* (advanced) | Sets the so timeout FTP and FTPS Only for Camel 2.4. SFTP for Camel 2.14.3/2.15.3/2.16 onwards. Is the SocketOptions.SO_TIMEOUT value in millis. Recommended option is to set this to 300000 so as not have a hanged connection. On SFTP this option is set as timeout on the JSCH Session instance. | 300000 | int
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
@@ -129,13 +131,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.scp.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.scp.enabled* | Enable scp component | true | Boolean
 | *camel.component.scp.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 | *camel.component.scp.verbose-logging* | JSCH is verbose logging out of the box. Therefore we turn the logging down to DEBUG logging by default. But setting this option to true turns on the verbose logging again. | false | Boolean
diff --git a/components/camel-json-validator/src/main/docs/json-validator-component.adoc b/components/camel-json-validator/src/main/docs/json-validator-component.adoc
index 6250d11..9094a15 100644
--- a/components/camel-json-validator/src/main/docs/json-validator-component.adoc
+++ b/components/camel-json-validator/src/main/docs/json-validator-component.adoc
@@ -36,7 +36,16 @@ the JSON Schema to validate against.
 === URI Options
 
 // component options: START
-The JSON Schema Validator component has no options.
+The JSON Schema Validator component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -60,7 +69,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (7 parameters):
+==== Query Parameters (8 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -70,6 +79,7 @@ with the following path and query parameters:
 | *failOnNullBody* (producer) | Whether to fail if no body exists. | true | boolean
 | *failOnNullHeader* (producer) | Whether to fail if no header exists when validating against a header. | true | boolean
 | *headerName* (producer) | To validate against a header instead of the message body. |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *errorHandler* (advanced) | To use a custom ValidatorErrorHandler. The default error handler captures the errors and throws an exception. |  | JsonValidatorError Handler
 | *schemaLoader* (advanced) | To use a custom schema loader allowing for adding custom format validation. The default implementation will create a schema loader with draft v4 support. |  | JsonSchemaLoader
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
@@ -91,13 +101,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.json-validator.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.json-validator.enabled* | Whether to enable auto configuration of the json-validator component. This is enabled by default. |  | Boolean
 | *camel.component.json-validator.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-jt400/src/main/docs/jt400-component.adoc b/components/camel-jt400/src/main/docs/jt400-component.adoc
index 6034c2e..8d84ecc 100644
--- a/components/camel-jt400/src/main/docs/jt400-component.adoc
+++ b/components/camel-jt400/src/main/docs/jt400-component.adoc
@@ -39,7 +39,7 @@ You can append query options to the URI in the following format,
 ### JT400 options
 
 // component options: START
-The JT400 component supports 2 options, which are listed below.
+The JT400 component supports 3 options, which are listed below.
 
 
 
@@ -48,6 +48,7 @@ The JT400 component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *connectionPool* (advanced) | Returns the default connection pool used by this component. |  | AS400ConnectionPool
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -75,7 +76,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (30 parameters):
+==== Query Parameters (31 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -95,6 +96,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -129,13 +131,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.jt400.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.jt400.connection-pool* | Returns the default connection pool used by this component. The option is a com.ibm.as400.access.AS400ConnectionPool type. |  | String
 | *camel.component.jt400.enabled* | Enable jt400 component | true | Boolean
 | *camel.component.jt400.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/components/camel-kafka/src/main/docs/kafka-component.adoc b/components/camel-kafka/src/main/docs/kafka-component.adoc
index 0951264..b41d5a4 100644
--- a/components/camel-kafka/src/main/docs/kafka-component.adoc
+++ b/components/camel-kafka/src/main/docs/kafka-component.adoc
@@ -33,7 +33,7 @@ kafka:topic[?options]
 
 
 // component options: START
-The Kafka component supports 8 options, which are listed below.
+The Kafka component supports 9 options, which are listed below.
 
 
 
@@ -48,6 +48,7 @@ The Kafka component supports 8 options, which are listed below.
 | *allowManualCommit* (consumer) | Whether to allow doing manual commits via KafkaManualCommit. If this option is enabled then an instance of KafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. | false | boolean
 | *kafkaManualCommit Factory* (consumer) | Factory to use for creating KafkaManualCommit instances. This allows to plugin a custom factory to create custom KafkaManualCommit instances in case special logic is needed when doing manual commits that deviates from the default implementation that comes out of the box. |  | KafkaManualCommit Factory
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -72,7 +73,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (95 parameters):
+==== Query Parameters (96 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -146,6 +147,7 @@ with the following path and query parameters:
 | *workerPool* (producer) | To use a custom worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. |  | ExecutorService
 | *workerPoolCoreSize* (producer) | Number of core threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | 10 | Integer
 | *workerPoolMaxSize* (producer) | Maximum number of threads for the worker pool for continue routing Exchange after kafka server has acknowledge the message that was sent to it from KafkaProducer using asynchronous non-blocking processing. | 20 | Integer
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *interceptorClasses* (monitoring) | Sets interceptors for producer or consumers. Producer interceptors have to be classes implementing org.apache.kafka.clients.producer.ProducerInterceptor Consumer interceptors have to be classes implementing org.apache.kafka.clients.consumer.ConsumerInterceptor Note that if you use Producer interceptor on a consumer it will throw a class cast exception in runtime |  | String
 | *kerberosBeforeReloginMin Time* (security) | Login thread sleep time between refresh attempts. | 60000 | Integer
@@ -191,7 +193,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 100 options, which are listed below.
+The component supports 101 options, which are listed below.
 
 
 
@@ -199,6 +201,7 @@ The component supports 100 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.kafka.allow-manual-commit* | Whether to allow doing manual commits via KafkaManualCommit. If this option is enabled then an instance of KafkaManualCommit is stored on the Exchange message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. | false | Boolean
+| *camel.component.kafka.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kafka.break-on-first-error* | This options controls what happens when a consumer is processing an exchange and it fails. If the option is false then the consumer continues to the next message and processes it. If the option is true then the consumer breaks out, and will seek back to offset of the message that caused a failure, and then re-attempt to process this message. However this can lead to endless processing of the same message if its bound to fail every time, eg [...]
 | *camel.component.kafka.brokers* | URL of the Kafka brokers to use. The format is host1:port1,host2:port2, and the list can be a subset of brokers or a VIP pointing to a subset of brokers. This option is known as bootstrap.servers in the Kafka documentation. |  | String
 | *camel.component.kafka.configuration.allow-manual-commit* | Whether to allow doing manual commits via {@link KafkaManualCommit}. <p/> If this option is enabled then an instance of {@link KafkaManualCommit} is stored on the {@link Exchange} message header, which allows end users to access this API and perform manual offset commits via the Kafka consumer. | false | Boolean
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
index ab0be11..fc5cadb 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-config-maps-component.adoc
@@ -10,7 +10,16 @@ provides a producer to execute kubernetes ConfigMap operations.
 ### Component Options
 
 // component options: START
-The Kubernetes ConfigMap component has no options.
+The Kubernetes ConfigMap component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -35,7 +44,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -47,6 +56,7 @@ with the following path and query parameters:
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
 | *portName* (producer) | The port name, used for ServiceCall EIP |  | String
 | *portProtocol* (producer) | The port protocol, used for ServiceCall EIP | tcp | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -79,13 +89,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-config-maps.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-config-maps.enabled* | Whether to enable auto configuration of the kubernetes-config-maps component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-config-maps.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
index 24d3576..001b272 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-deployments-component.adoc
@@ -11,7 +11,16 @@ provides a producer to execute kubernetes secret operations.
 ### Component Options
 
 // component options: START
-The Kubernetes Deployments component has no options.
+The Kubernetes Deployments component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -36,7 +45,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (28 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -56,6 +65,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -88,13 +98,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-deployments.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-deployments.enabled* | Whether to enable auto configuration of the kubernetes-deployments component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-deployments.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
index b46051ce..9b33696 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-hpa-component.adoc
@@ -12,7 +12,16 @@ hpa events.
 ### Component Options
 
 // component options: START
-The Kubernetes HPA component has no options.
+The Kubernetes HPA component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -37,7 +46,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (28 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -57,6 +66,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -89,13 +99,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-hpa.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-hpa.enabled* | Whether to enable auto configuration of the kubernetes-hpa component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-hpa.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
index f4c35ca..4f4c1a5 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-job-component.adoc
@@ -11,7 +11,16 @@ provides a producer to execute kubernetes job operations.
 ### Component Options
 
 // component options: START
-The Kubernetes Job component has no options.
+The Kubernetes Job component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -36,7 +45,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (28 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -56,6 +65,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -88,13 +98,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-job.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-job.enabled* | Whether to enable auto configuration of the kubernetes-job component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-job.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
index 21ee1e4..6c55812 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-namespaces-component.adoc
@@ -12,7 +12,16 @@ kubernetes namespace events.
 ### Component Options
 
 // component options: START
-The Kubernetes Namespaces component has no options.
+The Kubernetes Namespaces component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -37,7 +46,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (28 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -57,6 +66,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -89,13 +99,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-namespaces.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-namespaces.enabled* | Whether to enable auto configuration of the kubernetes-namespaces component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-namespaces.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
index 47a77bb..44cbbbf 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-nodes-component.adoc
@@ -12,7 +12,16 @@ node events.
 ### Component Options
 
 // component options: START
-The Kubernetes Nodes component has no options.
+The Kubernetes Nodes component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -37,7 +46,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (28 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -57,6 +66,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -89,13 +99,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-nodes.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-nodes.enabled* | Whether to enable auto configuration of the kubernetes-nodes component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-nodes.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
index 92a344a..703ba20 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-claims-component.adoc
@@ -11,7 +11,16 @@ provides a producer to execute kubernetes persistent volume claim operations.
 ### Component Options
 
 // component options: START
-The Kubernetes Persistent Volume Claim component has no options.
+The Kubernetes Persistent Volume Claim component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -36,7 +45,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -48,6 +57,7 @@ with the following path and query parameters:
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
 | *portName* (producer) | The port name, used for ServiceCall EIP |  | String
 | *portProtocol* (producer) | The port protocol, used for ServiceCall EIP | tcp | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -80,13 +90,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-persistent-volumes-claims.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-persistent-volumes-claims.enabled* | Whether to enable auto configuration of the kubernetes-persistent-volumes-claims component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-persistent-volumes-claims.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
index 637b0b5..6c7fc11 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-persistent-volumes-component.adoc
@@ -11,7 +11,16 @@ provides a producer to execute kubernetes persistent volume operations.
 ### Component Options
 
 // component options: START
-The Kubernetes Persistent Volume component has no options.
+The Kubernetes Persistent Volume component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -36,7 +45,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -48,6 +57,7 @@ with the following path and query parameters:
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
 | *portName* (producer) | The port name, used for ServiceCall EIP |  | String
 | *portProtocol* (producer) | The port protocol, used for ServiceCall EIP | tcp | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -80,13 +90,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-persistent-volumes.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-persistent-volumes.enabled* | Whether to enable auto configuration of the kubernetes-persistent-volumes component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-persistent-volumes.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
index 6df3aa7..99f8f66 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-pods-component.adoc
@@ -11,7 +11,16 @@ provides a producer to execute kubernetes pod operations.
 ### Component Options
 
 // component options: START
-The Kubernetes Pods component has no options.
+The Kubernetes Pods component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -36,7 +45,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (28 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -56,6 +65,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -88,13 +98,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-pods.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-pods.enabled* | Whether to enable auto configuration of the kubernetes-pods component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-pods.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
index 526ca8c..fc4234c 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-replication-controllers-component.adoc
@@ -12,7 +12,16 @@ consume kubernetes replication controller events.
 ### Component Options
 
 // component options: START
-The Kubernetes Replication Controller component has no options.
+The Kubernetes Replication Controller component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -37,7 +46,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (28 parameters):
+==== Query Parameters (29 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -57,6 +66,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -89,13 +99,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-replication-controllers.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-replication-controllers.enabled* | Whether to enable auto configuration of the kubernetes-replication-controllers component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-replication-controllers.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
index 06203a3..abc508a 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-resources-quota-component.adoc
@@ -11,7 +11,16 @@ provides a producer to execute kubernetes resource quota operations.
 ### Component Options
 
 // component options: START
-The Kubernetes Resources Quota component has no options.
+The Kubernetes Resources Quota component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -36,7 +45,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -48,6 +57,7 @@ with the following path and query parameters:
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
 | *portName* (producer) | The port name, used for ServiceCall EIP |  | String
 | *portProtocol* (producer) | The port protocol, used for ServiceCall EIP | tcp | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -80,13 +90,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-resources-quota.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-resources-quota.enabled* | Whether to enable auto configuration of the kubernetes-resources-quota component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-resources-quota.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
index b3ecbb9..4cf0617 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-secrets-component.adoc
@@ -11,7 +11,16 @@ provides a producer to execute kubernetes secret operations.
 ### Component Options
 
 // component options: START
-The Kubernetes Secrets component has no options.
+The Kubernetes Secrets component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -36,7 +45,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -48,6 +57,7 @@ with the following path and query parameters:
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
 | *portName* (producer) | The port name, used for ServiceCall EIP |  | String
 | *portProtocol* (producer) | The port protocol, used for ServiceCall EIP | tcp | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -80,13 +90,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-secrets.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-secrets.enabled* | Whether to enable auto configuration of the kubernetes-secrets component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-secrets.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
index c83359a..953ea11 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-service-accounts-component.adoc
@@ -10,7 +10,16 @@ provides a producer to execute kubernetes Service Account operations.
 ### Component Options
 
 // component options: START
-The Kubernetes Service Account component has no options.
+The Kubernetes Service Account component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -34,7 +43,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -46,6 +55,7 @@ with the following path and query parameters:
 | *operation* (producer) | Producer operation to do on Kubernetes |  | String
 | *portName* (producer) | The port name, used for ServiceCall EIP |  | String
 | *portProtocol* (producer) | The port protocol, used for ServiceCall EIP | tcp | String
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *connectionTimeout* (advanced) | Connection timeout in milliseconds to use when making requests to the Kubernetes API server. |  | Integer
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *caCertData* (security) | The CA Cert Data |  | String
@@ -78,13 +88,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.kubernetes-service-accounts.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.kubernetes-service-accounts.enabled* | Whether to enable auto configuration of the kubernetes-service-accounts component. This is enabled by default. |  | Boolean
 | *camel.component.kubernetes-service-accounts.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc b/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
index ca4c2ab..6f6f1b2 100644
--- a/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
+++ b/components/camel-kubernetes/src/main/docs/kubernetes-services-component.adoc
@@ -12,7 +12,16 @@ service events.
 ### Component Options
 
 // component options: START
-The Kubernetes Services component has no options.
+The Kubernetes Services component supports 2 options, which are listed below.
+
+
... 15547 lines suppressed ...

Reply | Threaded
Open this post in threaded view
|

[camel] 05/06: CAMEL-13557: Regen

davsclaus-2
In reply to this post by davsclaus-2
This is an automated email from the ASF dual-hosted git repository.

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

commit 3c079fb361262a51c99e067678d29ce8a3f795a7
Author: Claus Ibsen <[hidden email]>
AuthorDate: Fri May 24 11:51:46 2019 +0200

    CAMEL-13557: Regen
---
 .../modules/ROOT/pages/activemq-component.adoc        |  9 ++++++---
 docs/components/modules/ROOT/pages/ahc-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/ahc-ws-component.adoc          |  9 ++++++---
 .../components/modules/ROOT/pages/amqp-component.adoc |  9 ++++++---
 .../components/modules/ROOT/pages/apns-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/asterisk-component.adoc        | 17 ++++++++++++++---
 .../modules/ROOT/pages/atmos-component.adoc           |  9 ++++++---
 .../ROOT/pages/atmosphere-websocket-component.adoc    |  9 ++++++---
 .../components/modules/ROOT/pages/atom-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/atomix-map-component.adoc      |  9 ++++++---
 .../ROOT/pages/atomix-messaging-component.adoc        |  9 ++++++---
 .../modules/ROOT/pages/atomix-multimap-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/atomix-queue-component.adoc    |  9 ++++++---
 .../modules/ROOT/pages/atomix-set-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/atomix-value-component.adoc    |  9 ++++++---
 .../components/modules/ROOT/pages/avro-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/avro-dataformat.adoc           |  3 ++-
 .../modules/ROOT/pages/aws-cw-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/aws-ddb-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-ddbstream-component.adoc   |  9 ++++++---
 .../modules/ROOT/pages/aws-ec2-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-ecs-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-eks-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-iam-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-kinesis-component.adoc     |  9 ++++++---
 .../ROOT/pages/aws-kinesis-firehose-component.adoc    |  9 ++++++---
 .../modules/ROOT/pages/aws-kms-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-lambda-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/aws-mq-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/aws-msk-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-s3-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/aws-sdb-component.adoc         | 17 ++++++++++++++---
 .../modules/ROOT/pages/aws-ses-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-sns-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-sqs-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/aws-swf-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/azure-blob-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/azure-queue-component.adoc     |  9 ++++++---
 .../components/modules/ROOT/pages/bean-component.adoc |  6 ++++--
 .../modules/ROOT/pages/bean-validator-component.adoc  | 17 ++++++++++++++---
 .../modules/ROOT/pages/beanstalk-component.adoc       |  9 ++++++---
 .../modules/ROOT/pages/bonita-component.adoc          | 17 ++++++++++++++---
 .../modules/ROOT/pages/braintree-component.adoc       |  9 ++++++---
 .../modules/ROOT/pages/browse-component.adoc          | 17 ++++++++++++++---
 .../modules/ROOT/pages/caffeine-cache-component.adoc  |  9 ++++++---
 .../ROOT/pages/caffeine-loadcache-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/chatscript-component.adoc      | 17 ++++++++++++++---
 .../modules/ROOT/pages/chunk-component.adoc           | 17 ++++++++++++++---
 .../modules/ROOT/pages/class-component.adoc           |  6 ++++--
 .../modules/ROOT/pages/cm-sms-component.adoc          | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/cmis-component.adoc |  9 ++++++---
 .../components/modules/ROOT/pages/coap-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/cometd-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/consul-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/controlbus-component.adoc      | 17 ++++++++++++++---
 .../modules/ROOT/pages/corda-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/couchbase-component.adoc       | 17 ++++++++++++++---
 .../modules/ROOT/pages/couchdb-component.adoc         | 17 ++++++++++++++---
 docs/components/modules/ROOT/pages/cql-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/crypto-cms-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/crypto-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/crypto-dataformat.adoc         |  3 ++-
 docs/components/modules/ROOT/pages/cxf-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/cxfrs-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/dataformat-component.adoc      | 17 ++++++++++++++---
 .../modules/ROOT/pages/dataset-component.adoc         | 17 ++++++++++++++---
 .../modules/ROOT/pages/dataset-test-component.adoc    | 19 +++++++++++++++----
 .../modules/ROOT/pages/digitalocean-component.adoc    | 17 ++++++++++++++---
 .../modules/ROOT/pages/direct-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/direct-vm-component.adoc       |  6 ++++--
 .../modules/ROOT/pages/disruptor-component.adoc       | 10 +++++++---
 docs/components/modules/ROOT/pages/dns-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/docker-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/dozer-component.adoc           | 17 ++++++++++++++---
 .../modules/ROOT/pages/drill-component.adoc           | 17 ++++++++++++++---
 .../modules/ROOT/pages/dropbox-component.adoc         | 17 ++++++++++++++---
 .../modules/ROOT/pages/ehcache-component.adoc         |  9 ++++++---
 docs/components/modules/ROOT/pages/ejb-component.adoc |  6 ++++--
 .../ROOT/pages/elasticsearch-rest-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/elsql-component.adoc           |  9 ++++++---
 .../components/modules/ROOT/pages/etcd-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/eventadmin-component.adoc      |  6 ++++--
 .../components/modules/ROOT/pages/exec-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/facebook-component.adoc        |  9 ++++++---
 .../components/modules/ROOT/pages/file-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/flatpack-component.adoc        | 17 ++++++++++++++---
 .../modules/ROOT/pages/flatpack-dataformat.adoc       |  3 ++-
 .../modules/ROOT/pages/flink-component.adoc           |  9 ++++++---
 docs/components/modules/ROOT/pages/fop-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/freemarker-component.adoc      |  9 ++++++---
 docs/components/modules/ROOT/pages/ftp-component.adoc | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/ftps-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/ganglia-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/geocoder-component.adoc        | 17 ++++++++++++++---
 docs/components/modules/ROOT/pages/git-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/github-component.adoc          | 17 ++++++++++++++---
 .../modules/ROOT/pages/google-bigquery-component.adoc |  9 ++++++---
 .../ROOT/pages/google-bigquery-sql-component.adoc     |  9 ++++++---
 .../modules/ROOT/pages/google-calendar-component.adoc |  9 ++++++---
 .../ROOT/pages/google-calendar-stream-component.adoc  |  9 ++++++---
 .../modules/ROOT/pages/google-drive-component.adoc    |  9 ++++++---
 .../modules/ROOT/pages/google-mail-component.adoc     |  9 ++++++---
 .../ROOT/pages/google-mail-stream-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/google-pubsub-component.adoc   |  9 ++++++---
 .../modules/ROOT/pages/google-sheets-component.adoc   |  9 ++++++---
 .../ROOT/pages/google-sheets-stream-component.adoc    |  9 ++++++---
 .../components/modules/ROOT/pages/gora-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/grape-component.adoc           |  6 ++++--
 .../components/modules/ROOT/pages/grpc-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/guava-eventbus-component.adoc  |  9 ++++++---
 .../ROOT/pages/hazelcast-atomicvalue-component.adoc   |  9 ++++++---
 .../ROOT/pages/hazelcast-instance-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/hazelcast-list-component.adoc  |  9 ++++++---
 .../modules/ROOT/pages/hazelcast-map-component.adoc   |  9 ++++++---
 .../ROOT/pages/hazelcast-multimap-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/hazelcast-queue-component.adoc |  9 ++++++---
 .../ROOT/pages/hazelcast-replicatedmap-component.adoc |  9 ++++++---
 .../ROOT/pages/hazelcast-ringbuffer-component.adoc    |  9 ++++++---
 .../modules/ROOT/pages/hazelcast-seda-component.adoc  |  9 ++++++---
 .../modules/ROOT/pages/hazelcast-set-component.adoc   |  9 ++++++---
 .../modules/ROOT/pages/hazelcast-topic-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/hbase-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/hdfs2-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/hipchat-component.adoc         | 17 ++++++++++++++---
 .../modules/ROOT/pages/http4-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/iec60870-client-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/iec60870-server-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/ignite-cache-component.adoc    |  9 ++++++---
 .../modules/ROOT/pages/ignite-compute-component.adoc  |  9 ++++++---
 .../modules/ROOT/pages/ignite-events-component.adoc   |  9 ++++++---
 .../modules/ROOT/pages/ignite-idgen-component.adoc    |  9 ++++++---
 .../ROOT/pages/ignite-messaging-component.adoc        |  9 ++++++---
 .../modules/ROOT/pages/ignite-queue-component.adoc    |  9 ++++++---
 .../modules/ROOT/pages/ignite-set-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/infinispan-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/influxdb-component.adoc        | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/iota-component.adoc | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/ipfs-component.adoc | 17 ++++++++++++++---
 docs/components/modules/ROOT/pages/irc-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/ironmq-component.adoc          | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/jbpm-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/jcache-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/jclouds-component.adoc         |  9 ++++++---
 docs/components/modules/ROOT/pages/jcr-component.adoc | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/jdbc-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/jetty-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/jgroups-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/jgroups-raft-component.adoc    |  9 ++++++---
 .../components/modules/ROOT/pages/jing-component.adoc | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/jira-component.adoc |  9 ++++++---
 docs/components/modules/ROOT/pages/jms-component.adoc |  9 ++++++---
 docs/components/modules/ROOT/pages/jmx-component.adoc | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/jolt-component.adoc |  9 ++++++---
 .../components/modules/ROOT/pages/jooq-component.adoc |  9 ++++++---
 docs/components/modules/ROOT/pages/jpa-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/json-validator-component.adoc  | 17 ++++++++++++++---
 .../modules/ROOT/pages/jt400-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/kafka-component.adoc           |  9 ++++++---
 .../ROOT/pages/kubernetes-config-maps-component.adoc  | 17 ++++++++++++++---
 .../ROOT/pages/kubernetes-deployments-component.adoc  | 17 ++++++++++++++---
 .../modules/ROOT/pages/kubernetes-hpa-component.adoc  | 17 ++++++++++++++---
 .../modules/ROOT/pages/kubernetes-job-component.adoc  | 17 ++++++++++++++---
 .../ROOT/pages/kubernetes-namespaces-component.adoc   | 17 ++++++++++++++---
 .../ROOT/pages/kubernetes-nodes-component.adoc        | 17 ++++++++++++++---
 ...ubernetes-persistent-volumes-claims-component.adoc | 17 ++++++++++++++---
 .../kubernetes-persistent-volumes-component.adoc      | 17 ++++++++++++++---
 .../modules/ROOT/pages/kubernetes-pods-component.adoc | 17 ++++++++++++++---
 .../kubernetes-replication-controllers-component.adoc | 17 ++++++++++++++---
 .../pages/kubernetes-resources-quota-component.adoc   | 17 ++++++++++++++---
 .../ROOT/pages/kubernetes-secrets-component.adoc      | 17 ++++++++++++++---
 .../pages/kubernetes-service-accounts-component.adoc  | 17 ++++++++++++++---
 .../ROOT/pages/kubernetes-services-component.adoc     | 17 ++++++++++++++---
 .../modules/ROOT/pages/language-component.adoc        | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/ldap-component.adoc | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/ldif-component.adoc | 17 ++++++++++++++---
 docs/components/modules/ROOT/pages/log-component.adoc |  9 ++++++---
 docs/components/modules/ROOT/pages/lpr-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/lucene-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/lumberjack-component.adoc      |  9 ++++++---
 .../components/modules/ROOT/pages/mail-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/master-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/metrics-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/micrometer-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/milo-client-component.adoc     |  9 ++++++---
 .../modules/ROOT/pages/milo-server-component.adoc     |  9 ++++++---
 .../modules/ROOT/pages/mina2-component.adoc           |  9 ++++++---
 .../components/modules/ROOT/pages/mllp-component.adoc |  9 ++++++---
 .../components/modules/ROOT/pages/mock-component.adoc | 14 ++++++++++++--
 .../modules/ROOT/pages/mongodb-gridfs-component.adoc  | 17 ++++++++++++++---
 .../modules/ROOT/pages/mongodb3-component.adoc        | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/mqtt-component.adoc |  9 ++++++---
 docs/components/modules/ROOT/pages/msv-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/mustache-component.adoc        |  9 ++++++---
 .../components/modules/ROOT/pages/mvel-component.adoc | 17 ++++++++++++++---
 docs/components/modules/ROOT/pages/mvel-language.adoc |  3 ++-
 .../modules/ROOT/pages/mybatis-bean-component.adoc    |  9 ++++++---
 .../modules/ROOT/pages/mybatis-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/nagios-component.adoc          |  9 ++++++---
 .../components/modules/ROOT/pages/nats-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/netty4-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/netty4-http-component.adoc     |  9 ++++++---
 docs/components/modules/ROOT/pages/nsq-component.adoc |  9 ++++++---
 .../ROOT/pages/openshift-build-configs-component.adoc | 14 ++++++++++++--
 .../ROOT/pages/openshift-builds-component.adoc        | 14 ++++++++++++--
 .../ROOT/pages/openstack-cinder-component.adoc        | 17 ++++++++++++++---
 .../ROOT/pages/openstack-glance-component.adoc        | 17 ++++++++++++++---
 .../ROOT/pages/openstack-keystone-component.adoc      | 17 ++++++++++++++---
 .../ROOT/pages/openstack-neutron-component.adoc       | 17 ++++++++++++++---
 .../modules/ROOT/pages/openstack-nova-component.adoc  | 17 ++++++++++++++---
 .../modules/ROOT/pages/openstack-swift-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/optaplanner-component.adoc     | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/paho-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/paxlogging-component.adoc      |  6 ++++--
 docs/components/modules/ROOT/pages/pdf-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/pgevent-component.adoc         | 17 ++++++++++++++---
 .../modules/ROOT/pages/properties-component.adoc      |  9 ++++++---
 .../modules/ROOT/pages/pubnub-component.adoc          | 17 ++++++++++++++---
 .../modules/ROOT/pages/pulsar-component.adoc          | 11 +++++++----
 .../modules/ROOT/pages/quartz2-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/quickfix-component.adoc        |  9 ++++++---
 .../modules/ROOT/pages/rabbitmq-component.adoc        |  9 ++++++---
 .../ROOT/pages/reactive-streams-component.adoc        |  9 ++++++---
 docs/components/modules/ROOT/pages/ref-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/rest-api-component.adoc        | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/rest-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/rest-swagger-component.adoc    |  9 ++++++---
 .../modules/ROOT/pages/restlet-component.adoc         |  9 ++++++---
 docs/components/modules/ROOT/pages/rss-component.adoc | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/rss-dataformat.adoc |  3 ++-
 .../components/modules/ROOT/pages/saga-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/sap-netweaver-component.adoc   | 17 ++++++++++++++---
 .../modules/ROOT/pages/scheduler-component.adoc       |  9 ++++++---
 .../modules/ROOT/pages/schematron-component.adoc      | 17 ++++++++++++++---
 docs/components/modules/ROOT/pages/scp-component.adoc |  9 ++++++---
 .../components/modules/ROOT/pages/seda-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/service-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/servlet-component.adoc         |  9 ++++++---
 .../components/modules/ROOT/pages/sftp-component.adoc | 14 ++++++++++++--
 docs/components/modules/ROOT/pages/sip-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/sjms-batch-component.adoc      |  9 ++++++---
 .../components/modules/ROOT/pages/sjms-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/sjms2-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/slack-component.adoc           |  9 ++++++---
 .../components/modules/ROOT/pages/smpp-component.adoc |  9 ++++++---
 .../components/modules/ROOT/pages/snmp-component.adoc | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/solr-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/soroush-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/spark-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/spark-rest-component.adoc      |  6 ++++--
 .../modules/ROOT/pages/splunk-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/spring-batch-component.adoc    |  9 ++++++---
 .../modules/ROOT/pages/spring-event-component.adoc    | 17 ++++++++++++++---
 .../ROOT/pages/spring-integration-component.adoc      | 17 ++++++++++++++---
 .../modules/ROOT/pages/spring-ldap-component.adoc     | 17 ++++++++++++++---
 .../modules/ROOT/pages/spring-redis-component.adoc    | 17 ++++++++++++++---
 .../modules/ROOT/pages/spring-ws-component.adoc       |  9 ++++++---
 docs/components/modules/ROOT/pages/sql-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/sql-stored-component.adoc      |  9 ++++++---
 docs/components/modules/ROOT/pages/ssh-component.adoc |  9 ++++++---
 .../components/modules/ROOT/pages/stax-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/stomp-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/stream-component.adoc          | 17 ++++++++++++++---
 .../modules/ROOT/pages/string-template-component.adoc | 17 ++++++++++++++---
 .../components/modules/ROOT/pages/stub-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/telegram-component.adoc        |  9 ++++++---
 .../modules/ROOT/pages/thrift-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/thrift-dataformat.adoc         |  3 ++-
 .../components/modules/ROOT/pages/tika-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/timer-component.adoc           | 17 ++++++++++++++---
 .../modules/ROOT/pages/twilio-component.adoc          |  9 ++++++---
 .../ROOT/pages/twitter-directmessage-component.adoc   |  9 ++++++---
 .../modules/ROOT/pages/twitter-search-component.adoc  |  9 ++++++---
 .../ROOT/pages/twitter-streaming-component.adoc       |  9 ++++++---
 .../ROOT/pages/twitter-timeline-component.adoc        |  9 ++++++---
 .../modules/ROOT/pages/undertow-component.adoc        |  9 ++++++---
 .../modules/ROOT/pages/validator-component.adoc       |  9 ++++++---
 .../modules/ROOT/pages/velocity-component.adoc        |  9 ++++++---
 .../modules/ROOT/pages/vertx-component.adoc           |  9 ++++++---
 docs/components/modules/ROOT/pages/vm-component.adoc  |  9 ++++++---
 .../modules/ROOT/pages/weather-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/web3j-component.adoc           |  9 ++++++---
 .../modules/ROOT/pages/webhook-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/websocket-component.adoc       |  9 ++++++---
 .../ROOT/pages/websocket-jsr356-component.adoc        | 17 ++++++++++++++---
 .../modules/ROOT/pages/wordpress-component.adoc       |  9 ++++++---
 .../modules/ROOT/pages/xchange-component.adoc         | 17 ++++++++++++++---
 .../modules/ROOT/pages/xmlsecurity-component.adoc     |  9 ++++++---
 .../components/modules/ROOT/pages/xmpp-component.adoc | 17 ++++++++++++++---
 .../modules/ROOT/pages/xquery-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/xquery-language.adoc           |  3 ++-
 .../components/modules/ROOT/pages/xslt-component.adoc |  9 ++++++---
 .../modules/ROOT/pages/yammer-component.adoc          |  9 ++++++---
 .../modules/ROOT/pages/zendesk-component.adoc         |  9 ++++++---
 .../modules/ROOT/pages/zookeeper-component.adoc       |  9 ++++++---
 .../ROOT/pages/zookeeper-master-component.adoc        |  9 ++++++---
 295 files changed, 2505 insertions(+), 861 deletions(-)

diff --git a/docs/components/modules/ROOT/pages/activemq-component.adoc b/docs/components/modules/ROOT/pages/activemq-component.adoc
index 30f82c9..4ced490 100644
--- a/docs/components/modules/ROOT/pages/activemq-component.adoc
+++ b/docs/components/modules/ROOT/pages/activemq-component.adoc
@@ -44,7 +44,7 @@ activemq:foo
 === Component options
 
 // component options: START
-The ActiveMQ component supports 85 options, which are listed below.
+The ActiveMQ component supports 86 options, which are listed below.
 
 
 
@@ -136,6 +136,7 @@ The ActiveMQ component supports 85 options, which are listed below.
 | *formatDateHeadersTo Iso8601* (producer) | Sets whether date headers should be formatted according to the ISO 8601 standard. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -162,7 +163,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (91 parameters):
+==== Query Parameters (92 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -224,6 +225,7 @@ with the following path and query parameters:
 | *allowSerializedHeaders* (advanced) | Controls whether or not to include serialized headers. Applies only when isTransferExchange() is true. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | boolean
 | *asyncStartListener* (advanced) | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, the [...]
 | *asyncStopListener* (advanced) | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *destinationResolver* (advanced) | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). |  | DestinationResolver
 | *errorHandler* (advanced) | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom errorHandler. [...]
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
@@ -278,7 +280,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 86 options, which are listed below.
+The component supports 87 options, which are listed below.
 
 
 
@@ -296,6 +298,7 @@ The component supports 86 options, which are listed below.
 | *camel.component.activemq.async-start-listener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this opt [...]
 | *camel.component.activemq.async-stop-listener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | Boolean
 | *camel.component.activemq.auto-startup* | Specifies whether the consumer container should auto-startup. | true | Boolean
+| *camel.component.activemq.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.activemq.broker-u-r-l* | Sets the broker URL to use to connect to ActiveMQ using the ActiveMQ URI format |  | String
 | *camel.component.activemq.cache-level* | Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details. |  | Integer
 | *camel.component.activemq.cache-level-name* | Sets the cache level by name for the underlying JMS resources. Possible values are: CACHE_AUTO, CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default setting is CACHE_AUTO. See the Spring documentation and Transactions Cache Levels for more information. | CACHE_AUTO | String
diff --git a/docs/components/modules/ROOT/pages/ahc-component.adoc b/docs/components/modules/ROOT/pages/ahc-component.adoc
index 8a69a1f..fd0ed79 100644
--- a/docs/components/modules/ROOT/pages/ahc-component.adoc
+++ b/docs/components/modules/ROOT/pages/ahc-component.adoc
@@ -63,7 +63,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (13 parameters):
+==== Query Parameters (14 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -76,6 +76,7 @@ with the following path and query parameters:
 | *headerFilterStrategy* (producer) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *throwExceptionOnFailure* (producer) | Option to disable throwing the AhcOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | true | boolean
 | *transferException* (producer) | If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type (for example using Jetty or Servlet Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the AhcOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enab [...]
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *binding* (advanced) | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. |  | AhcBinding
 | *clientConfig* (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. |  | AsyncHttpClientConfig
 | *clientConfigOptions* (advanced) | To configure the AsyncHttpClientConfig using the key/values from the Map. |  | Map
@@ -100,7 +101,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
 
 
 
@@ -108,6 +109,7 @@ The component supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.ahc.allow-java-serialized-object* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | Boolean
+| *camel.component.ahc.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ahc.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. The option is a org.apache.camel.component.ahc.AhcBinding type. |  | String
 | *camel.component.ahc.client* | To use a custom AsyncHttpClient. The option is a org.asynchttpclient.AsyncHttpClient type. |  | String
 | *camel.component.ahc.client-config* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. The option is a org.asynchttpclient.AsyncHttpClientConfig type. |  | String
@@ -138,7 +140,7 @@ The component supports 9 options, which are listed below.
 
 
 // component options: START
-The AHC component supports 8 options, which are listed below.
+The AHC component supports 9 options, which are listed below.
 
 
 
@@ -153,6 +155,7 @@ The AHC component supports 8 options, which are listed below.
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
diff --git a/docs/components/modules/ROOT/pages/ahc-ws-component.adoc b/docs/components/modules/ROOT/pages/ahc-ws-component.adoc
index 3674206..d2a30d1 100644
--- a/docs/components/modules/ROOT/pages/ahc-ws-component.adoc
+++ b/docs/components/modules/ROOT/pages/ahc-ws-component.adoc
@@ -42,7 +42,7 @@ various configuration options of the AHC component.
 
 
 // component options: START
-The AHC Websocket component supports 8 options, which are listed below.
+The AHC Websocket component supports 9 options, which are listed below.
 
 
 
@@ -57,6 +57,7 @@ The AHC Websocket component supports 8 options, which are listed below.
 | *useGlobalSslContext Parameters* (security) | Enable usage of global SSL context parameters. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -82,7 +83,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (15 parameters):
+==== Query Parameters (16 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -97,6 +98,7 @@ with the following path and query parameters:
 | *headerFilterStrategy* (producer) | To use a custom HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *throwExceptionOnFailure* (producer) | Option to disable throwing the AhcOperationFailedException in case of failed responses from the remote server. This allows you to get all responses regardless of the HTTP status code. | true | boolean
 | *transferException* (producer) | If enabled and an Exchange failed processing on the consumer side, and if the caused Exception was send back serialized in the response as a application/x-java-serialized-object content type (for example using Jetty or Servlet Camel components). On the producer side the exception will be deserialized and thrown as is, instead of the AhcOperationFailedException. The caused exception is required to be serialized. This is by default turned off. If you enab [...]
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *binding* (advanced) | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. |  | AhcBinding
 | *clientConfig* (advanced) | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. |  | AsyncHttpClientConfig
 | *clientConfigOptions* (advanced) | To configure the AsyncHttpClientConfig using the key/values from the Map. |  | Map
@@ -121,7 +123,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
 
 
 
@@ -129,6 +131,7 @@ The component supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.ahc-ws.allow-java-serialized-object* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | Boolean
+| *camel.component.ahc-ws.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.ahc-ws.binding* | To use a custom AhcBinding which allows to control how to bind between AHC and Camel. The option is a org.apache.camel.component.ahc.AhcBinding type. |  | String
 | *camel.component.ahc-ws.client* | To use a custom AsyncHttpClient. The option is a org.asynchttpclient.AsyncHttpClient type. |  | String
 | *camel.component.ahc-ws.client-config* | To configure the AsyncHttpClient to use a custom com.ning.http.client.AsyncHttpClientConfig instance. The option is a org.asynchttpclient.AsyncHttpClientConfig type. |  | String
diff --git a/docs/components/modules/ROOT/pages/amqp-component.adoc b/docs/components/modules/ROOT/pages/amqp-component.adoc
index 8932c4b..38b2afb 100644
--- a/docs/components/modules/ROOT/pages/amqp-component.adoc
+++ b/docs/components/modules/ROOT/pages/amqp-component.adoc
@@ -39,7 +39,7 @@ link:../../../../camel-jms/src/main/docs/readme.html[JMS] component after the de
 
 
 // component options: START
-The AMQP component supports 80 options, which are listed below.
+The AMQP component supports 81 options, which are listed below.
 
 
 
@@ -126,6 +126,7 @@ The AMQP component supports 80 options, which are listed below.
 | *formatDateHeadersTo Iso8601* (producer) | Sets whether date headers should be formatted according to the ISO 8601 standard. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -155,7 +156,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (91 parameters):
+==== Query Parameters (92 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -217,6 +218,7 @@ with the following path and query parameters:
 | *allowSerializedHeaders* (advanced) | Controls whether or not to include serialized headers. Applies only when isTransferExchange() is true. This requires that the objects are serializable. Camel will exclude any non-serializable objects and log it at WARN level. | false | boolean
 | *asyncStartListener* (advanced) | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option is used, the [...]
 | *asyncStopListener* (advanced) | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *destinationResolver* (advanced) | A pluggable org.springframework.jms.support.destination.DestinationResolver that allows you to use your own resolver (for example, to lookup the real destination in a JNDI registry). |  | DestinationResolver
 | *errorHandler* (advanced) | Specifies a org.springframework.util.ErrorHandler to be invoked in case of any uncaught exceptions thrown while processing a Message. By default these exceptions will be logged at the WARN level, if no errorHandler has been configured. You can configure logging level and whether stack traces should be logged using errorHandlerLoggingLevel and errorHandlerLogStackTrace options. This makes it much easier to configure, than having to code a custom errorHandler. [...]
 | *exceptionListener* (advanced) | Specifies the JMS Exception Listener that is to be notified of any underlying JMS exceptions. |  | ExceptionListener
@@ -270,7 +272,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 81 options, which are listed below.
+The component supports 82 options, which are listed below.
 
 
 
@@ -288,6 +290,7 @@ The component supports 81 options, which are listed below.
 | *camel.component.amqp.async-start-listener* | Whether to startup the JmsConsumer message listener asynchronously, when starting a route. For example if a JmsConsumer cannot get a connection to a remote JMS broker, then it may block while retrying and/or failover. This will cause Camel to block while starting routes. By setting this option to true, you will let routes startup, while the JmsConsumer connects to the JMS broker using a dedicated thread in asynchronous mode. If this option  [...]
 | *camel.component.amqp.async-stop-listener* | Whether to stop the JmsConsumer message listener asynchronously, when stopping a route. | false | Boolean
 | *camel.component.amqp.auto-startup* | Specifies whether the consumer container should auto-startup. | true | Boolean
+| *camel.component.amqp.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.amqp.cache-level* | Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details. |  | Integer
 | *camel.component.amqp.cache-level-name* | Sets the cache level by name for the underlying JMS resources. Possible values are: CACHE_AUTO, CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default setting is CACHE_AUTO. See the Spring documentation and Transactions Cache Levels for more information. | CACHE_AUTO | String
 | *camel.component.amqp.client-id* | Sets the JMS client ID to use. Note that this value, if specified, must be unique and can only be used by a single JMS connection instance. It is typically only required for durable topic subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics instead. |  | String
diff --git a/docs/components/modules/ROOT/pages/apns-component.adoc b/docs/components/modules/ROOT/pages/apns-component.adoc
index 8955b60..92e97c0 100644
--- a/docs/components/modules/ROOT/pages/apns-component.adoc
+++ b/docs/components/modules/ROOT/pages/apns-component.adoc
@@ -52,7 +52,7 @@ apns:consumer[?options]
 
 
 // component options: START
-The APNS component supports 2 options, which are listed below.
+The APNS component supports 3 options, which are listed below.
 
 
 
@@ -61,6 +61,7 @@ The APNS component supports 2 options, which are listed below.
 | Name | Description | Default | Type
 | *apnsService* (common) | *Required* The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService |  | ApnsService
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -86,7 +87,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (20 parameters):
+==== Query Parameters (21 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -98,6 +99,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -130,7 +132,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 3 options, which are listed below.
+The component supports 4 options, which are listed below.
 
 
 
@@ -138,6 +140,7 @@ The component supports 3 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.apns.apns-service* | The ApnsService to use. The org.apache.camel.component.apns.factory.ApnsServiceFactory can be used to build a ApnsService. The option is a com.notnoop.apns.ApnsService type. |  | String
+| *camel.component.apns.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.apns.enabled* | Enable apns component | true | Boolean
 | *camel.component.apns.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/docs/components/modules/ROOT/pages/asterisk-component.adoc b/docs/components/modules/ROOT/pages/asterisk-component.adoc
index 7f0be60..e655c3b 100644
--- a/docs/components/modules/ROOT/pages/asterisk-component.adoc
+++ b/docs/components/modules/ROOT/pages/asterisk-component.adoc
@@ -30,7 +30,16 @@ asterisk:name[?options]
 ### Options
 
 // component options: START
-The Asterisk component has no options.
+The Asterisk component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 // endpoint options: START
@@ -52,7 +61,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (8 parameters):
+==== Query Parameters (9 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -65,6 +74,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *action* (producer) | What action to perform such as getting queue status, sip peers or extension state. |  | AsteriskAction
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -84,13 +94,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.asterisk.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.asterisk.enabled* | Enable asterisk component | true | Boolean
 | *camel.component.asterisk.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/docs/components/modules/ROOT/pages/atmos-component.adoc b/docs/components/modules/ROOT/pages/atmos-component.adoc
index 6b2ccdd..eb321ca 100644
--- a/docs/components/modules/ROOT/pages/atmos-component.adoc
+++ b/docs/components/modules/ROOT/pages/atmos-component.adoc
@@ -16,7 +16,7 @@ from("atmos:foo/get?remotePath=/path").to("mock:test");
 
 
 // component options: START
-The Atmos component supports 5 options, which are listed below.
+The Atmos component supports 6 options, which are listed below.
 
 
 
@@ -28,6 +28,7 @@ The Atmos component supports 5 options, which are listed below.
 | *uri* (advanced) | The URI of the server for the Atmos client to connect to |  | String
 | *sslValidation* (security) | Whether the Atmos client should perform SSL validation | false | boolean
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -53,7 +54,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (12 parameters):
+==== Query Parameters (13 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -70,6 +71,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 |===
 // endpoint options: END
@@ -89,13 +91,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 6 options, which are listed below.
+The component supports 7 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.atmos.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atmos.enabled* | Enable atmos component | true | Boolean
 | *camel.component.atmos.full-token-id* | The token id to pass to the Atmos client |  | String
 | *camel.component.atmos.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
diff --git a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
index ff14a63..fca7bbf 100644
--- a/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
+++ b/docs/components/modules/ROOT/pages/atmosphere-websocket-component.adoc
@@ -35,7 +35,7 @@ their `pom.xml` for this component:
 
 
 // component options: START
-The Atmosphere Websocket component supports 9 options, which are listed below.
+The Atmosphere Websocket component supports 10 options, which are listed below.
 
 
 
@@ -51,6 +51,7 @@ The Atmosphere Websocket component supports 9 options, which are listed below.
 | *allowJavaSerialized Object* (advanced) | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | boolean
 | *headerFilterStrategy* (filter) | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. |  | HeaderFilterStrategy
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -76,7 +77,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (24 parameters):
+==== Query Parameters (25 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -102,6 +103,7 @@ with the following path and query parameters:
 | *fileNameExtWhitelist* (consumer) | Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml. |  | String
 | *optionsEnabled* (consumer) | Specifies whether to enable HTTP OPTIONS for this Servlet consumer. By default OPTIONS is turned off. | false | boolean
 | *traceEnabled* (consumer) | Specifies whether to enable HTTP TRACE for this Servlet consumer. By default TRACE is turned off. | false | boolean
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *mapHttpMessageBody* (advanced) | If this option is true then IN exchange Body of the exchange will be mapped to HTTP body. Setting this to false will avoid the HTTP mapping. | true | boolean
 | *mapHttpMessageFormUrl EncodedBody* (advanced) | If this option is true then IN exchange Form Encoded body of the exchange will be mapped to HTTP. Setting this to false will avoid the HTTP Form Encoded body mapping. | true | boolean
 | *mapHttpMessageHeaders* (advanced) | If this option is true then IN exchange Headers of the exchange will be mapped to HTTP headers. Setting this to false will avoid the HTTP Headers mapping. | true | boolean
@@ -124,7 +126,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 10 options, which are listed below.
+The component supports 11 options, which are listed below.
 
 
 
@@ -133,6 +135,7 @@ The component supports 10 options, which are listed below.
 | Name | Description | Default | Type
 | *camel.component.atmosphere-websocket.allow-java-serialized-object* | Whether to allow java serialization when a request uses context-type=application/x-java-serialized-object. This is by default turned off. If you enable this then be aware that Java will deserialize the incoming data from the request to Java and that can be a potential security risk. | false | Boolean
 | *camel.component.atmosphere-websocket.attachment-multipart-binding* | Whether to automatic bind multipart/form-data as attachments on the Camel Exchange. The options attachmentMultipartBinding=true and disableStreamCache=false cannot work together. Remove disableStreamCache to use AttachmentMultipartBinding. This is turn off by default as this may require servlet specific configuration to enable this when using Servlet's. | false | Boolean
+| *camel.component.atmosphere-websocket.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atmosphere-websocket.enabled* | Enable atmosphere-websocket component | true | Boolean
 | *camel.component.atmosphere-websocket.file-name-ext-whitelist* | Whitelist of accepted filename extensions for accepting uploaded files. Multiple extensions can be separated by comma, such as txt,xml. |  | String
 | *camel.component.atmosphere-websocket.header-filter-strategy* | To use a custom org.apache.camel.spi.HeaderFilterStrategy to filter header to and from Camel message. The option is a org.apache.camel.spi.HeaderFilterStrategy type. |  | String
diff --git a/docs/components/modules/ROOT/pages/atom-component.adoc b/docs/components/modules/ROOT/pages/atom-component.adoc
index 21e050f..8eb7b4c 100644
--- a/docs/components/modules/ROOT/pages/atom-component.adoc
+++ b/docs/components/modules/ROOT/pages/atom-component.adoc
@@ -35,7 +35,16 @@ Where *atomUri* is the URI to the Atom feed to poll.
 
 
 // component options: START
-The Atom component has no options.
+The Atom component supports 2 options, which are listed below.
+
+
+
+[width="100%",cols="2,5,^1,2",options="header"]
+|===
+| Name | Description | Default | Type
+| *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
+|===
 // component options: END
 
 
@@ -59,7 +68,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (27 parameters):
+==== Query Parameters (28 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -78,6 +87,7 @@ with the following path and query parameters:
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
 | *pollStrategy* (consumer) | A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel. |  | PollingConsumerPoll Strategy
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *synchronous* (advanced) | Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported). | false | boolean
 | *backoffErrorThreshold* (scheduler) | The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in. |  | int
 | *backoffIdleThreshold* (scheduler) | The number of subsequent idle polls that should happen before the backoffMultipler should kick-in. |  | int
@@ -110,13 +120,14 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 2 options, which are listed below.
+The component supports 3 options, which are listed below.
 
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
 |===
 | Name | Description | Default | Type
+| *camel.component.atom.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atom.enabled* | Enable atom component | true | Boolean
 | *camel.component.atom.resolve-property-placeholders* | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | Boolean
 |===
diff --git a/docs/components/modules/ROOT/pages/atomix-map-component.adoc b/docs/components/modules/ROOT/pages/atomix-map-component.adoc
index f06972c..d3d8c34 100644
--- a/docs/components/modules/ROOT/pages/atomix-map-component.adoc
+++ b/docs/components/modules/ROOT/pages/atomix-map-component.adoc
@@ -26,7 +26,7 @@ Maven users will need to add the following dependency to their pom.xml for this
 ### Options
 
 // component options: START
-The Atomix Map component supports 5 options, which are listed below.
+The Atomix Map component supports 6 options, which are listed below.
 
 
 
@@ -38,6 +38,7 @@ The Atomix Map component supports 5 options, which are listed below.
 | *nodes* (common) | The nodes the AtomixClient should connect to |  | List
 | *configurationUri* (common) | The path to the AtomixClient configuration |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -60,7 +61,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (18 parameters):
+==== Query Parameters (19 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -77,6 +78,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exchangePattern* (consumer) | Sets the exchange pattern when the consumer creates an exchange. |  | ExchangePattern
+| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 | *defaultResourceConfig* (advanced) | The cluster wide default resource configuration. |  | Properties
 | *defaultResourceOptions* (advanced) | The local default resource options. |  | Properties
 | *ephemeral* (advanced) | Sets if the local member should join groups as PersistentMember or not. If set to ephemeral the local member will receive an auto generated ID thus the local one is ignored. | false | boolean
@@ -102,7 +104,7 @@ When using Spring Boot make sure to use the following Maven dependency to have s
 ----
 
 
-The component supports 9 options, which are listed below.
+The component supports 10 options, which are listed below.
 
 
 
@@ -110,6 +112,7 @@ The component supports 9 options, which are listed below.
 |===
 | Name | Description | Default | Type
 | *camel.component.atomix-map.atomix* | The shared AtomixClient instance. The option is a io.atomix.AtomixClient type. |  | String
+| *camel.component.atomix-map.basic-property-binding* | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | Boolean
 | *camel.component.atomix-map.configuration-uri* | The path to the AtomixClient configuration |  | String
 | *camel.component.atomix-map.configuration.default-action* | The default action. |  | AtomixMap$Action
 | *camel.component.atomix-map.configuration.key* | The key to use if none is set in the header or to listen for events for a specific key. |  | Object
diff --git a/docs/components/modules/ROOT/pages/atomix-messaging-component.adoc b/docs/components/modules/ROOT/pages/atomix-messaging-component.adoc
index d2940ef..b4827ff 100644
--- a/docs/components/modules/ROOT/pages/atomix-messaging-component.adoc
+++ b/docs/components/modules/ROOT/pages/atomix-messaging-component.adoc
@@ -25,7 +25,7 @@ for this component:
 ----
 
 // component options: START
-The Atomix Messaging component supports 5 options, which are listed below.
+The Atomix Messaging component supports 6 options, which are listed below.
 
 
 
@@ -37,6 +37,7 @@ The Atomix Messaging component supports 5 options, which are listed below.
 | *nodes* (common) | The nodes the AtomixClient should connect to |  | List
 | *configurationUri* (common) | The path to the AtomixClient configuration |  | String
 | *resolveProperty Placeholders* (advanced) | Whether the component should resolve property placeholders on itself when starting. Only properties which are of String type can use property placeholders. | true | boolean
+| *basicPropertyBinding* (advanced) | Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities | false | boolean
 |===
 // component options: END
 
@@ -59,7 +60,7 @@ with the following path and query parameters:
 |===
 
 
-==== Query Parameters (19 parameters):
+==== Query Parameters (20 parameters):
 
 
 [width="100%",cols="2,5,^1,2",options="header"]
@@ -77,6 +78,7 @@ with the following path and query parameters:
 | *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that will be logged at WARN or ERROR level and ignored. | false | boolean
 | *exceptionHandler* (consumer) | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored. |  | ExceptionHandler
 | *exch