You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2020/12/18 09:14:23 UTC

[camel-k-runtime] 02/10: Update to camel 3.7.x

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

lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git

commit 19b15f376d1c5628ca50c208487e25eeabd1bcc8
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Wed Nov 25 00:10:01 2020 +0100

    Update to camel 3.7.x
---
 .../apache/camel/k/SourceDefinitionConfigurer.java |   46 +-
 .../k/listener/SourcesConfigurerConfigurer.java    |   19 +-
 .../CronSourceLoaderInterceptorConfigurer.java     |   25 +-
 ...tiveSinkBindingContextCustomizerConfigurer.java |   28 +-
 .../k/loader/groovy/GroovySourceLoaderTest.groovy  |    2 +-
 .../src/generated/resources/camel-yaml-dsl.json    |   46 +-
 .../generated/resources/camel-yaml-endpoint.json   | 2534 +++++---------------
 .../WebhookContextCustomizerConfigurer.java        |   19 +-
 .../KameletReifyComponentConfigurer.java           |   33 +-
 .../KameletReifyEndpointConfigurer.java            |   36 +-
 .../component/kameletreify/kamelet-reify.json      |   19 +-
 .../kamelet/KameletComponentConfigurer.java        |   63 +-
 .../kamelet/KameletConfigurationConfigurer.java    |   66 -
 .../kamelet/KameletEndpointConfigurer.java         |   44 +-
 ...he.camel.component.kamelet.KameletConfiguration |    2 -
 .../apache/camel/component/kamelet/kamelet.json    |   34 +-
 .../apache/camel/component/kamelet/Kamelet.java    |   74 +-
 .../camel/component/kamelet/KameletComponent.java  |  172 +-
 .../component/kamelet/KameletConfiguration.java    |   44 -
 .../kamelet/support/PropertiesConfigurer.java      |   30 -
 .../apache/camel/configurer/java.util.Properties   |   18 -
 .../component/kamelet/KameletComponentTest.java    |   16 +-
 .../knative/spi/CloudEventTypeConverterLoader.java |   36 -
 .../knative/spi/KnativeEnvironmentConfigurer.java  |   19 +-
 .../knative/spi/KnativeResourceConfigurer.java     |   58 +-
 .../services/org/apache/camel/TypeConverterLoader  |    2 -
 .../knative/KnativeComponentConfigurer.java        |   87 +-
 .../knative/KnativeEndpointConfigurer.java         |   77 +-
 .../apache/camel/component/knative/knative.json    |   75 +-
 .../camel/component/knative/KnativeComponent.java  |   41 +-
 pom.xml                                            |    8 +-
 31 files changed, 1118 insertions(+), 2655 deletions(-)

diff --git a/camel-k-core/api/src/generated/java/org/apache/camel/k/SourceDefinitionConfigurer.java b/camel-k-core/api/src/generated/java/org/apache/camel/k/SourceDefinitionConfigurer.java
index 8f01900..df03263 100644
--- a/camel-k-core/api/src/generated/java/org/apache/camel/k/SourceDefinitionConfigurer.java
+++ b/camel-k-core/api/src/generated/java/org/apache/camel/k/SourceDefinitionConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.k;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.k.SourceDefinition;
 
@@ -15,22 +17,6 @@ import org.apache.camel.k.SourceDefinition;
 @SuppressWarnings("unchecked")
 public class SourceDefinitionConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("Compressed", boolean.class);
-        map.put("Content", byte[].class);
-        map.put("Id", java.lang.String.class);
-        map.put("Interceptors", java.util.List.class);
-        map.put("Language", java.lang.String.class);
-        map.put("Loader", java.lang.String.class);
-        map.put("Location", java.lang.String.class);
-        map.put("Name", java.lang.String.class);
-        map.put("PropertyNames", java.util.List.class);
-        map.put("Type", org.apache.camel.k.SourceType.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         org.apache.camel.k.SourceDefinition target = (org.apache.camel.k.SourceDefinition) obj;
@@ -60,8 +46,30 @@ public class SourceDefinitionConfigurer extends org.apache.camel.support.compone
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "compressed":
+        case "Compressed": return boolean.class;
+        case "content":
+        case "Content": return byte[].class;
+        case "id":
+        case "Id": return java.lang.String.class;
+        case "interceptors":
+        case "Interceptors": return java.util.List.class;
+        case "language":
+        case "Language": return java.lang.String.class;
+        case "loader":
+        case "Loader": return java.lang.String.class;
+        case "location":
+        case "Location": return java.lang.String.class;
+        case "name":
+        case "Name": return java.lang.String.class;
+        case "propertynames":
+        case "PropertyNames": return java.util.List.class;
+        case "type":
+        case "Type": return org.apache.camel.k.SourceType.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/camel-k-core/support/src/generated/java/org/apache/camel/k/listener/SourcesConfigurerConfigurer.java b/camel-k-core/support/src/generated/java/org/apache/camel/k/listener/SourcesConfigurerConfigurer.java
index 9944e06..38116ba 100644
--- a/camel-k-core/support/src/generated/java/org/apache/camel/k/listener/SourcesConfigurerConfigurer.java
+++ b/camel-k-core/support/src/generated/java/org/apache/camel/k/listener/SourcesConfigurerConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.k.listener;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.k.listener.SourcesConfigurer;
 
@@ -15,13 +17,6 @@ import org.apache.camel.k.listener.SourcesConfigurer;
 @SuppressWarnings("unchecked")
 public class SourcesConfigurerConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("Sources", org.apache.camel.k.SourceDefinition[].class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         org.apache.camel.k.listener.SourcesConfigurer target = (org.apache.camel.k.listener.SourcesConfigurer) obj;
@@ -33,8 +28,12 @@ public class SourcesConfigurerConfigurer extends org.apache.camel.support.compon
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "sources":
+        case "Sources": return org.apache.camel.k.SourceDefinition[].class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/camel-k-cron/impl/src/generated/java/org/apache/camel/k/cron/CronSourceLoaderInterceptorConfigurer.java b/camel-k-cron/impl/src/generated/java/org/apache/camel/k/cron/CronSourceLoaderInterceptorConfigurer.java
index 832d7db..a238c62 100644
--- a/camel-k-cron/impl/src/generated/java/org/apache/camel/k/cron/CronSourceLoaderInterceptorConfigurer.java
+++ b/camel-k-cron/impl/src/generated/java/org/apache/camel/k/cron/CronSourceLoaderInterceptorConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.k.cron;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.k.cron.CronSourceLoaderInterceptor;
 
@@ -15,15 +17,6 @@ import org.apache.camel.k.cron.CronSourceLoaderInterceptor;
 @SuppressWarnings("unchecked")
 public class CronSourceLoaderInterceptorConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("OverridableComponents", java.lang.String.class);
-        map.put("Runtime", org.apache.camel.k.Runtime.class);
-        map.put("TimerUri", java.lang.String.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         org.apache.camel.k.cron.CronSourceLoaderInterceptor target = (org.apache.camel.k.cron.CronSourceLoaderInterceptor) obj;
@@ -39,8 +32,16 @@ public class CronSourceLoaderInterceptorConfigurer extends org.apache.camel.supp
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "overridablecomponents":
+        case "OverridableComponents": return java.lang.String.class;
+        case "runtime":
+        case "Runtime": return org.apache.camel.k.Runtime.class;
+        case "timeruri":
+        case "TimerUri": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java b/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java
index c193c00..791d848 100644
--- a/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java
+++ b/camel-k-knative/impl/src/generated/java/org/apache/camel/k/knative/customizer/KnativeSinkBindingContextCustomizerConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.k.knative.customizer;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer;
 
@@ -15,16 +17,6 @@ import org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer
 @SuppressWarnings("unchecked")
 public class KnativeSinkBindingContextCustomizerConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("ApiVersion", java.lang.String.class);
-        map.put("Kind", java.lang.String.class);
-        map.put("Name", java.lang.String.class);
-        map.put("Type", org.apache.camel.component.knative.spi.Knative.Type.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer target = (org.apache.camel.k.knative.customizer.KnativeSinkBindingContextCustomizer) obj;
@@ -42,8 +34,18 @@ public class KnativeSinkBindingContextCustomizerConfigurer extends org.apache.ca
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "apiversion":
+        case "ApiVersion": return java.lang.String.class;
+        case "kind":
+        case "Kind": return java.lang.String.class;
+        case "name":
+        case "Name": return java.lang.String.class;
+        case "type":
+        case "Type": return org.apache.camel.component.knative.spi.Knative.Type.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy b/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
index 5691bb9..4d8de5e 100644
--- a/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
+++ b/camel-k-loader-groovy/impl/src/test/groovy/org/apache/camel/k/loader/groovy/GroovySourceLoaderTest.groovy
@@ -22,6 +22,7 @@ import org.apache.camel.RuntimeCamelException
 import org.apache.camel.component.jackson.JacksonDataFormat
 import org.apache.camel.component.log.LogComponent
 import org.apache.camel.component.seda.SedaComponent
+import org.apache.camel.impl.engine.DefaultChannel
 import org.apache.camel.k.loader.groovy.support.MyBean
 import org.apache.camel.k.loader.groovy.support.TestRuntime
 import org.apache.camel.language.bean.BeanLanguage
@@ -31,7 +32,6 @@ import org.apache.camel.model.rest.GetVerbDefinition
 import org.apache.camel.model.rest.PostVerbDefinition
 import org.apache.camel.processor.FatalFallbackErrorHandler
 import org.apache.camel.processor.SendProcessor
-import org.apache.camel.processor.channel.DefaultChannel
 import org.apache.camel.spi.HeaderFilterStrategy
 import org.apache.camel.support.DefaultHeaderFilterStrategy
 import spock.lang.AutoCleanup
diff --git a/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-dsl.json b/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-dsl.json
index cdc91e0..53c0993 100644
--- a/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-dsl.json
+++ b/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-dsl.json
@@ -40,6 +40,9 @@
           "hl7terser" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.language.Hl7TerserExpression"
           },
+          "joor" : {
+            "$ref" : "#/items/definitions/org.apache.camel.model.language.JoorExpression"
+          },
           "jsonpath" : {
             "$ref" : "#/items/definitions/org.apache.camel.model.language.JsonPathExpression"
           },
@@ -154,6 +157,34 @@
           "required" : [ "expression" ]
         } ]
       },
+      "org.apache.camel.model.language.JoorExpression" : {
+        "anyOf" : [ {
+          "type" : "string"
+        }, {
+          "type" : "object",
+          "properties" : {
+            "pre-compile" : {
+              "type" : "string"
+            },
+            "result-type" : {
+              "type" : "string"
+            },
+            "single-quotes" : {
+              "type" : "string"
+            },
+            "expression" : {
+              "type" : "string"
+            },
+            "id" : {
+              "type" : "string"
+            },
+            "trim" : {
+              "type" : "string"
+            }
+          },
+          "required" : [ "expression" ]
+        } ]
+      },
       "org.apache.camel.model.language.JsonPathExpression" : {
         "anyOf" : [ {
           "type" : "string"
@@ -445,6 +476,9 @@
         }, {
           "type" : "object",
           "properties" : {
+            "configuration-ref" : {
+              "type" : "string"
+            },
             "header-name" : {
               "type" : "string"
             },
@@ -1343,7 +1377,7 @@
             "type" : "string"
           },
           "library" : {
-            "enum" : [ "XStream", "Jackson", "Johnzon", "Gson", "Fastjson" ]
+            "enum" : [ "XStream", "Jackson", "Johnzon", "Gson", "Fastjson", "Jsonb" ]
           },
           "module-class-names" : {
             "type" : "string"
@@ -3120,6 +3154,9 @@
                 "$ref" : "#/items/definitions/step"
               }
             },
+            "delimiter" : {
+              "type" : "string"
+            },
             "executor-service-ref" : {
               "type" : "string"
             },
@@ -3375,7 +3412,12 @@
         "anyOf" : [ {
           "type" : "string"
         }, {
-          "type" : "object"
+          "type" : "object",
+          "properties" : {
+            "support-transacted" : {
+              "type" : "boolean"
+            }
+          }
         } ]
       },
       "org.apache.camel.builder.ErrorHandlerBuilderSupport" : {
diff --git a/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-endpoint.json b/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-endpoint.json
index 0fe105c..84635b9 100644
--- a/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-endpoint.json
+++ b/camel-k-loader-yaml/impl/src/generated/resources/camel-yaml-endpoint.json
@@ -76,11 +76,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cache-level" : {
           "description" : "Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details.",
           "type" : "integer"
@@ -480,11 +475,6 @@
           "description" : "The URI to use such as http://hostname:port/path",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binding" : {
           "description" : "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
           "type" : "string"
@@ -558,11 +548,6 @@
           "description" : "The URI to use such as http://hostname:port/path",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binding" : {
           "description" : "To use a custom AhcBinding which allows to control how to bind between AHC and Camel.",
           "type" : "string"
@@ -730,11 +715,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cache-level" : {
           "description" : "Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details.",
           "type" : "integer"
@@ -1145,11 +1125,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -1252,11 +1227,6 @@
           "description" : "database name",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "document-collection" : {
           "description" : "Collection name, when using ArangoDb as a Document Database. Set the documentCollection name when using the CRUD operation on the document database collections (SAVE_DOCUMENT , FIND_DOCUMENT_BY_KEY, UPDATE_DOCUMENT, DELETE_DOCUMENT).",
           "type" : "string"
@@ -1338,11 +1308,6 @@
           "enum" : [ "1.0", "1.1" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "client-fqdn" : {
           "description" : "The Client Fully Qualified Domain Name (FQDN). Used in message ids sent by endpoint.",
           "default" : "camel.apache.org",
@@ -1477,11 +1442,6 @@
           "enum" : [ "QUEUE_STATUS", "SIP_PEERS", "EXTENSION_STATE" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -1520,6 +1480,54 @@
         }
       }
     },
+    "atlasmap" : {
+      "type" : "object",
+      "required" : [ "resourceUri" ],
+      "properties" : {
+        "resource-uri" : {
+          "description" : "Path to the resource. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod.",
+          "type" : "string"
+        },
+        "allow-context-map-all" : {
+          "description" : "Sets whether the context map should allow access to all details. By default only the message body and headers can be accessed. This option can be enabled for full access to the current Exchange and CamelContext. Doing so impose a potential security risk as this opens access to the full power of CamelContext API.",
+          "default" : "false",
+          "type" : "boolean"
+        },
+        "content-cache" : {
+          "description" : "Sets whether to use resource content cache or not",
+          "default" : "false",
+          "type" : "boolean"
+        },
+        "lazy-start-producer" : {
+          "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
+          "default" : "false",
+          "type" : "boolean"
+        },
+        "properties-file" : {
+          "description" : "The URI of the properties file which is used for AtlasContextFactory initialization.",
+          "type" : "string"
+        },
+        "source-map-name" : {
+          "description" : "The Exchange property name for a source message map which hold java.util.Map&lt;String, Message&gt; where the key is AtlasMap Document ID. AtlasMap consumes Message bodies as source documents, as well as message headers as source properties where the scope equals to Document ID.",
+          "type" : "string"
+        },
+        "synchronous" : {
+          "description" : "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+          "default" : "false",
+          "type" : "boolean"
+        },
+        "target-map-mode" : {
+          "description" : "TargetMapMode enum value to specify how multiple target documents are delivered if exist. 'MAP': Stores them into a java.util.Map, and the java.util.Map is set to an exchange property if 'targetMapName' is specified, otherwise message body. 'MESSAGE_HEADER': Stores them into message headers. 'EXCHANGE_PROPERTY': Stores them into exchange properties. )",
+          "default" : "MAP",
+          "enum" : [ "MAP", "MESSAGE_HEADER", "EXCHANGE_PROPERTY" ],
+          "type" : "string"
+        },
+        "target-map-name" : {
+          "description" : "The Exchange property name for a target document map which hold java.util.Map&lt;String, Object&gt; where the key is AtlasMap Document ID. AtlasMap populates multiple target documents into this map.",
+          "type" : "string"
+        }
+      }
+    },
     "atmos" : {
       "type" : "object",
       "properties" : {
@@ -1532,11 +1540,6 @@
           "enum" : [ "put", "del", "search", "get", "move" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -1615,11 +1618,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-endpoint" : {
           "description" : "If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back.",
           "default" : "false",
@@ -1761,11 +1759,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -1900,11 +1893,6 @@
           "description" : "The Atomix instance to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -2000,11 +1988,6 @@
           "description" : "The Atomix instance to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -2106,11 +2089,6 @@
           "description" : "The Atomix instance to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "configuration-uri" : {
           "description" : "The Atomix configuration uri.",
           "type" : "string"
@@ -2192,11 +2170,6 @@
           "description" : "The Atomix instance to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -2284,11 +2257,6 @@
           "description" : "The Atomix instance to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -2380,11 +2348,6 @@
           "description" : "The Atomix instance to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -2485,11 +2448,6 @@
           "enum" : [ "http", "netty" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -2563,11 +2521,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -2639,11 +2592,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "consistent-read" : {
           "description" : "Determines whether or not strong consistency should be enforced when data is read.",
           "default" : "false",
@@ -2738,11 +2686,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -2885,11 +2828,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -2946,11 +2884,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "ecs-client" : {
           "description" : "To use a existing configured AWS ECS as client",
           "type" : "string"
@@ -3011,11 +2944,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "eks-client" : {
           "description" : "To use a existing configured AWS EKS as client",
           "type" : "string"
@@ -3076,11 +3004,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "iam-client" : {
           "description" : "To use a existing configured AWS IAM as client",
           "type" : "string"
@@ -3157,11 +3080,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -3320,11 +3238,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -3376,11 +3289,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "kms-client" : {
           "description" : "To use a existing configured AWS KMS as client",
           "type" : "string"
@@ -3445,11 +3353,6 @@
           "description" : "To use a existing configured AwsLambdaClient as client",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -3511,11 +3414,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -3572,11 +3470,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -3672,11 +3565,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -3921,11 +3809,6 @@
           "description" : "To use the AmazonSimpleDB as the client",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "consistent-read" : {
           "description" : "Determines whether or not strong consistency should be enforced when data is read.",
           "default" : "false",
@@ -3996,11 +3879,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -4081,11 +3959,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "header-filter-strategy" : {
           "description" : "To use a custom HeaderFilterStrategy to map headers to/from Camel.",
           "type" : "string"
@@ -4201,11 +4074,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -4471,11 +4339,6 @@
           "description" : "To use the given AmazonSimpleWorkflowClient as client",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -4604,11 +4467,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -4677,16 +4535,6 @@
           "description" : "The AmazonAthena instance to use as the client.",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "client-request-token" : {
           "description" : "A unique string to ensure issues queries are idempotent. It is unlikely you will need to set this.",
           "type" : "string"
@@ -4826,16 +4674,6 @@
           "description" : "To use the AmazonCloudWatch as the client",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -4907,16 +4745,6 @@
           "description" : "To use the AmazonDynamoDB as the client",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "consistent-read" : {
           "description" : "Determines whether or not strong consistency should be enforced when data is read.",
           "default" : "false",
@@ -4999,11 +4827,6 @@
           "description" : "Amazon DynamoDB client to use for all requests for this endpoint",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-          "default" : "true",
-          "type" : "boolean"
-        },
         "backoff-error-threshold" : {
           "description" : "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.",
           "type" : "integer"
@@ -5016,11 +4839,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -5163,16 +4981,6 @@
           "description" : "To use a existing configured AmazonEC2Client as client",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -5234,16 +5042,6 @@
           "description" : "Amazon AWS Access Key",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "ecs-client" : {
           "description" : "To use a existing configured AWS ECS as client",
           "type" : "string"
@@ -5309,16 +5107,6 @@
           "description" : "Amazon AWS Access Key",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "eks-client" : {
           "description" : "To use a existing configured AWS EKS as client",
           "type" : "string"
@@ -5384,16 +5172,6 @@
           "description" : "Amazon AWS Access Key",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "event-pattern-file" : {
           "description" : "EventPattern File",
           "type" : "string"
@@ -5464,16 +5242,6 @@
           "description" : "Amazon AWS Access Key",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "iam-client" : {
           "description" : "To use a existing configured AWS IAM as client",
           "type" : "string"
@@ -5544,11 +5312,6 @@
           "description" : "Amazon Kinesis client to use for all requests for this endpoint",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-          "default" : "true",
-          "type" : "boolean"
-        },
         "backoff-error-threshold" : {
           "description" : "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.",
           "type" : "integer"
@@ -5561,11 +5324,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -5729,16 +5487,6 @@
           "description" : "Amazon Kinesis Firehose client to use for all requests for this endpoint",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cbor-enabled" : {
           "description" : "This option will set the CBOR_ENABLED property during the execution",
           "default" : "true",
@@ -5800,16 +5548,6 @@
           "description" : "Amazon AWS Access Key",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "kms-client" : {
           "description" : "To use a existing configured AWS KMS as client",
           "type" : "string"
@@ -5875,20 +5613,10 @@
           "description" : "Amazon AWS Access Key",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
         "aws-lambda-client" : {
           "description" : "To use a existing configured AwsLambdaClient as client",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -5955,16 +5683,6 @@
           "description" : "To use a existing configured AmazonMQClient as client",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -6026,16 +5744,6 @@
           "description" : "Amazon AWS Access Key",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -6105,16 +5813,15 @@
           "description" : "Reference to a com.amazonaws.services.s3.AmazonS3 in the registry.",
           "type" : "string"
         },
+        "amazon-s3-presigner" : {
+          "description" : "An S3 Presigner for Request, used mainly in createDownloadLink operation",
+          "type" : "string"
+        },
         "auto-create-bucket" : {
           "description" : "Setting the autocreation of the S3 bucket bucketName. This will apply also in case of moveAfterRead option enabled and it will create the destinationBucket if it doesn't exist already.",
           "default" : "true",
           "type" : "boolean"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
         "autoclose-body" : {
           "description" : "If this option is true and includeBody is false, then the S3Object.close() method will be called on exchange completion. This option is strongly related to includeBody option. In case of setting includeBody to false and autocloseBody to false, it will be up to the caller to close the S3Object stream. Setting autocloseBody to true, will close the S3Object stream automatically.",
           "default" : "true",
@@ -6136,11 +5843,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -6373,15 +6075,15 @@
           "default" : "false",
           "type" : "boolean"
         },
+        "use-default-credentials-provider" : {
+          "description" : "Set whether the S3 client should expect to load credentials through a default credentials provider or to expect static credentials to be passed in.",
+          "default" : "false",
+          "type" : "boolean"
+        },
         "use-fixed-delay" : {
           "description" : "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.",
           "default" : "true",
           "type" : "boolean"
-        },
-        "use-iam-credentials" : {
-          "description" : "Set whether the S3 client should expect to load credentials on an EC2 instance or to expect static credentials to be passed in.",
-          "default" : "false",
-          "type" : "boolean"
         }
       }
     },
@@ -6401,16 +6103,6 @@
           "description" : "To use the AmazonSimpleEmailService as the client",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -6487,16 +6179,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "header-filter-strategy" : {
           "description" : "To use a custom HeaderFilterStrategy to map headers to/from Camel.",
           "type" : "string"
@@ -6567,6 +6249,11 @@
           "description" : "If we want to trust all certificates in case of overriding the endpoint",
           "default" : "false",
           "type" : "boolean"
+        },
+        "use-default-credentials-provider" : {
+          "description" : "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+          "default" : "false",
+          "type" : "boolean"
         }
       }
     },
@@ -6600,11 +6287,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
         "backoff-error-threshold" : {
           "description" : "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.",
           "type" : "integer"
@@ -6617,11 +6299,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -6839,6 +6516,11 @@
           "default" : "false",
           "type" : "boolean"
         },
+        "use-default-credentials-provider" : {
+          "description" : "Set whether the SQS client should expect to load credentials on an AWS infra instance or to expect static credentials to be passed in.",
+          "default" : "false",
+          "type" : "boolean"
+        },
         "use-fixed-delay" : {
           "description" : "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.",
           "default" : "true",
@@ -6866,16 +6548,6 @@
           "description" : "Amazon AWS Access Key",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -6943,21 +6615,11 @@
           "description" : "Amazon AWS Access Key",
           "type" : "string"
         },
-        "auto-discover-client" : {
-          "description" : "Setting the autoDiscoverClient mechanism, if true, the component will look for a client instance in the registry automatically otherwise it will skip that checking.",
-          "default" : "true",
-          "type" : "boolean"
-        },
         "autodetect-source-language" : {
           "description" : "Being able to autodetect the source language",
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -7032,11 +6694,6 @@
           "description" : "The blob service client",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "blob-metadata" : {
           "description" : "Set the blob meta-data",
           "type" : "string"
@@ -7167,11 +6824,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "blob-access-key" : {
           "description" : "In case you chose the default BlobCheckpointStore, this sets access key for the associated azure account name to be used for authentication with azure blob services",
           "type" : "string"
@@ -7269,11 +6921,6 @@
           "description" : "The queue service client",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -7355,11 +7002,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "blob-name" : {
           "description" : "The blob name, to consume specific blob from a container. However on producer, is only required for the operations on the blob level",
           "type" : "string"
@@ -7474,6 +7116,10 @@
           "description" : "Filters the results to return only blobs whose names begin with the specified prefix. May be null to return all blobs.",
           "type" : "string"
         },
+        "regex" : {
+          "description" : "Filters the results to return only blobs whose names match the specified regular expression. May be null to return all if both prefix and regex are set, regex takes the priority and prefix is ignored.",
+          "type" : "string"
+        },
         "service-client" : {
           "description" : "Client to a storage account. This client does not hold any state about a particular storage account but is instead a convenient way of sending off appropriate requests to the resource on the service. It may also be used to construct URLs to blobs and containers. This client contains operations on a service account. Operations on a container are available on BlobContainerClient through BlobServiceClient#getBlobContainerClient(String), and operations on a blob ar [...]
           "type" : "string"
@@ -7509,11 +7155,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -7591,11 +7232,6 @@
           "description" : "Sets the name of the bean to invoke",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cache" : {
           "description" : "Use scope option instead.",
           "type" : "boolean"
@@ -7634,11 +7270,6 @@
           "description" : "Where label is an arbitrary text value describing the endpoint",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "constraint-validator-factory" : {
           "description" : "To use a custom ConstraintValidatorFactory",
           "type" : "string"
@@ -7705,11 +7336,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -7839,11 +7465,6 @@
           "enum" : [ "startCase" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "hostname" : {
           "description" : "Hostname where Bonita engine runs",
           "default" : "localhost",
@@ -7900,11 +7521,6 @@
           "default" : "APP_USER_AUTHENTICATION",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "client-id" : {
           "description" : "Box application client ID",
           "type" : "string"
@@ -8003,11 +7619,6 @@
           "description" : "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.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "environment" : {
           "description" : "The environment Either SANDBOX or PRODUCTION",
           "type" : "string"
@@ -8075,11 +7686,6 @@
           "description" : "A name which can be any string to uniquely identify the endpoint",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -8118,11 +7724,6 @@
           "description" : "To configure the default cache action. If an action is set in the message header, then the operation from the header takes precedence.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cache-loader" : {
           "description" : "To configure a CacheLoader in case of a LoadCache use",
           "type" : "string"
@@ -8207,11 +7808,6 @@
           "description" : "To configure the default cache action. If an action is set in the message header, then the operation from the header takes precedence.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cache-loader" : {
           "description" : "To configure a CacheLoader in case of a LoadCache use",
           "type" : "string"
@@ -8301,11 +7897,6 @@
           "default" : "1024",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "chat-user-name" : {
           "description" : "Username who initializes the CS conversation. To be set when chat is initialized from camel route",
           "type" : "string"
@@ -8345,11 +7936,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Sets whether to use resource content cache or not",
           "default" : "false",
@@ -8395,11 +7981,6 @@
           "description" : "Sets the name of the bean to invoke",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cache" : {
           "description" : "Use scope option instead.",
           "type" : "boolean"
@@ -8438,11 +8019,6 @@
           "description" : "SMS Provider HOST with scheme",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "default-from" : {
           "description" : "This is the sender name. The maximum length is 11 characters.",
           "type" : "string"
@@ -8481,11 +8057,6 @@
           "description" : "URL to the cmis repository",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -8562,11 +8133,6 @@
           "description" : "Sets the alias used to query the KeyStore for the private key and certificate. This parameter is used when we are enabling TLS with certificates on the service side, and similarly on the client side when TLS is used with certificates and client authentication. If the parameter is not specified then the default behavior is to use the first alias in the keystore that contains a key entry. This configuration parameter does not apply to configuring TLS via a Raw Pu [...]
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -8667,11 +8233,6 @@
           "description" : "The root directory for the web resources or classpath. Use the protocol file: or classpath: depending if you want that the component loads the resource from file system or classpath. Classpath is required for OSGI deployment where the resources are packaged in the jar",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -8767,11 +8328,6 @@
           "description" : "The default action. Can be overridden by CamelConsulAction",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "block-seconds" : {
           "description" : "The second to wait for a watch event, default 10 seconds",
           "default" : "10",
@@ -8917,11 +8473,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -8957,11 +8508,6 @@
           "description" : "The url for the corda node",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -9033,7 +8579,7 @@
     },
     "couchbase" : {
       "type" : "object",
-      "required" : [ "hostname", "protocol" ],
+      "required" : [ "hostname", "protocol", "bucket" ],
       "properties" : {
         "hostname" : {
           "description" : "The hostname to use",
@@ -9069,11 +8615,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -9087,6 +8628,11 @@
           "description" : "The collection to use",
           "type" : "string"
         },
+        "connect-timeout" : {
+          "description" : "Define the timeoutconnect in milliseconds",
+          "default" : "2500",
+          "type" : "string"
+        },
         "consumer-processed-strategy" : {
           "description" : "Define the consumer Processed strategy to use",
           "default" : "none",
@@ -9116,6 +8662,11 @@
           "enum" : [ "InOnly", "InOut", "InOptionalOut" ],
           "type" : "string"
         },
+        "full-document" : {
+          "description" : "If true consumer will return complete document instead data defined in view",
+          "default" : "false",
+          "type" : "boolean"
+        },
         "greedy" : {
           "description" : "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.",
           "default" : "false",
@@ -9282,11 +8833,6 @@
           "enum" : [ "http", "https" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -9382,11 +8928,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -9528,11 +9069,6 @@
           "description" : "The name of the cron trigger",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -9580,11 +9116,6 @@
           "description" : "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 org.apache.camel.component.crypto.DigitalSignatureConstants#KEYSTORE_ALIAS",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "buffer-size" : {
           "description" : "Set the size of the buffer used to read in the Exchange payload data.",
           "default" : "2048",
@@ -9676,11 +9207,6 @@
           "description" : "The name part in the URI can be chosen by the user to distinguish between different signer/verifier/encryptor/decryptor endpoints within the camel context.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-encryption-algorithm" : {
           "description" : "Encryption algorithm, for example DESede/CBC/PKCS5Padding. Further possible values: DESede/CBC/PKCS5Padding, AES/CBC/PKCS5Padding, Camellia/CBC/PKCS5Padding, CAST5/CBC/PKCS5Padding.",
           "enum" : [ "AES/CBC/PKCS5Padding", "DESede/CBC/PKCS5Padding", "Camellia/CBC/PKCS5Padding", "CAST5/CBC/PKCS5Padding" ],
@@ -9770,11 +9296,6 @@
           "description" : "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.",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binding-id" : {
           "description" : "The bindingId for the service model to use.",
           "type" : "string"
@@ -9939,11 +9460,6 @@
           "description" : "To lookup an existing configured CxfRsEndpoint. Must used bean: as prefix.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binding" : {
           "description" : "To use a custom CxfBinding to control the binding between Camel Message and CXF Message.",
           "type" : "string"
@@ -10099,11 +9615,6 @@
           "enum" : [ "marshal", "unmarshal" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -10129,11 +9640,6 @@
           "default" : "0",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -10253,11 +9759,6 @@
           "default" : "0",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "copy-on-exchange" : {
           "description" : "Sets whether to make a deep copy of the incoming Exchange when received at this mock endpoint. Is by default true.",
           "default" : "true",
@@ -10340,11 +9841,6 @@
           "description" : "Additional properties for debezium components in case they can't be set directly on the camel configurations (e.g: setting Kafka Connect properties needed by Debezium engine, for example setting KafkaOffsetBackingStore), the properties have to be prefixed with additionalProperties.. E.g: additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -10610,11 +10106,6 @@
           "description" : "Additional properties for debezium components in case they can't be set directly on the camel configurations (e.g: setting Kafka Connect properties needed by Debezium engine, for example setting KafkaOffsetBackingStore), the properties have to be prefixed with additionalProperties.. E.g: additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bigint-unsigned-handling-mode" : {
           "description" : "Specify how BIGINT UNSIGNED columns should be represented in change events, including:'precise' uses java.math.BigDecimal to represent values, which are encoded in the change events using a binary representation and Kafka Connect's 'org.apache.kafka.connect.data.Decimal' type; 'long' (the default) represents values using Java's 'long', which may not offer the precision but will be far easier to use in consumers.",
           "default" : "long",
@@ -10991,11 +10482,6 @@
           "description" : "Additional properties for debezium components in case they can't be set directly on the camel configurations (e.g: setting Kafka Connect properties needed by Debezium engine, for example setting KafkaOffsetBackingStore), the properties have to be prefixed with additionalProperties.. E.g: additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binary-handling-mode" : {
           "description" : "Specify how binary (blob, binary, etc.) columns should be represented in change events, including:'bytes' represents binary data as byte array (default)'base64' represents binary data as base64-encoded string'hex' represents binary data as hex-encoded (base16) string",
           "default" : "bytes",
@@ -11391,11 +10877,6 @@
           "description" : "Additional properties for debezium components in case they can't be set directly on the camel configurations (e.g: setting Kafka Connect properties needed by Debezium engine, for example setting KafkaOffsetBackingStore), the properties have to be prefixed with additionalProperties.. E.g: additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=http://localhost:8811/avro",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -11696,11 +11177,6 @@
           "enum" : [ "create", "update", "delete", "list", "ownList", "get", "listBackups", "listActions", "listNeighbors", "listSnapshots", "listKernels", "listAllNeighbors", "enableBackups", "disableBackups", "reboot", "powerCycle", "shutdown", "powerOn", "powerOff", "restore", "resetPassword", "resize", "rebuild", "rename", "changeKernel", "enableIpv6", "enablePrivateNetworking", "takeSnapshot", "transfer", "convert", "attach", "detach", "assign", "unassign", "tag", "untag" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "digital-ocean-client" : {
           "description" : "To use a existing configured DigitalOceanClient as client",
           "type" : "string"
@@ -11761,11 +11237,6 @@
           "description" : "Name of direct endpoint",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "block" : {
           "description" : "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.",
           "default" : "true",
@@ -11815,11 +11286,6 @@
           "description" : "Name of direct-vm endpoint",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "block" : {
           "description" : "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.",
           "default" : "true",
@@ -11878,11 +11344,6 @@
           "description" : "Name of queue",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "block-when-full" : {
           "description" : "Whether a thread that sends messages to a full Disruptor will block until the ringbuffer's capacity is no longer exhausted. By default, the calling thread will block and wait until the message can be accepted. By disabling this option, an exception will be thrown stating that the queue is full.",
           "default" : "false",
@@ -11968,11 +11429,6 @@
           "description" : "Model Artifact",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -12002,11 +11458,6 @@
           "enum" : [ "dig", "ip", "lookup", "wikipedia" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -12028,11 +11479,6 @@
           "enum" : [ "events", "stats", "auth", "info", "ping", "version", "imagebuild", "imagecreate", "imageinspect", "imagelist", "imagepull", "imagepushimageremove", "imagesearch", "imagetag", "containerattach", "containercommit", "containercopyfile", "containercreate", "containerdiffinspectcontainer", "containerkill", "containerlist", "containerlog", "containerpause", "containerrestart", "containerremove", "containerstartcontainerstop", "containertop", "containerunpause", "container [...]
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -12146,11 +11592,6 @@
           "description" : "A human readable name of the mapping.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -12196,11 +11637,6 @@
           "description" : "Host name or IP address",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cluster-id" : {
           "description" : "Cluster ID https://drill.apache.org/docs/using-the-jdbc-driver/#determining-the-cluster-id",
           "type" : "string"
@@ -12245,11 +11681,6 @@
           "description" : "The access token to make API requests for a specific Dropbox user",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -12317,11 +11748,6 @@
           "description" : "To configure the default cache action. If an action is set in the message header, then the operation from the header takes precedence.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -12410,11 +11836,6 @@
           "description" : "Name of the cluster",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "connection-timeout" : {
           "description" : "The time in ms to wait before connection will timeout.",
           "default" : "30000",
@@ -12537,11 +11958,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "batch" : {
           "description" : "Enables or disables batch mode",
           "default" : "false",
@@ -12757,11 +12173,6 @@
           "description" : "The path the endpoint refers to",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -12828,11 +12239,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -12975,11 +12381,6 @@
           "description" : "The path the endpoint refers to",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -13054,11 +12455,6 @@
           "description" : "The arguments may be one or many whitespace-separated tokens.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binding" : {
           "description" : "A reference to a org.apache.commons.exec.ExecBinding in the Registry.",
           "type" : "string"
@@ -13126,11 +12522,6 @@
           "description" : "The ID of the Facebook Application",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -13581,11 +12972,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -13828,11 +13214,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -14232,11 +13613,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -14325,11 +13701,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -14453,11 +13824,6 @@
           "enum" : [ "dataset", "datastream" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "collect" : {
           "description" : "Indicates if results should be collected or counted.",
           "default" : "true",
@@ -14500,11 +13866,6 @@
           "enum" : [ "pdf", "ps", "pcl", "png", "jpeg", "svg", "xml", "mif", "rtf", "txt" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "fop-factory" : {
           "description" : "Allows to use a custom configured or implementation of org.apache.fop.apps.FopFactory.",
           "type" : "string"
@@ -14543,11 +13904,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "configuration" : {
           "description" : "Sets the Freemarker configuration to use",
           "type" : "string"
@@ -14635,11 +13991,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binary" : {
           "description" : "Specifies the file transfer mode, BINARY or ASCII. Default is ASCII (false).",
           "default" : "false",
@@ -15163,11 +14514,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binary" : {
           "description" : "Specifies the file transfer mode, BINARY or ASCII. Default is ASCII (false).",
           "default" : "false",
@@ -15681,11 +15027,6 @@
           "default" : "8649",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "dmax" : {
           "description" : "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.",
           "default" : "0",
@@ -15773,11 +15114,6 @@
           "description" : "API Key to access Google. Mandatory for Google GeoCoding server.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "client-id" : {
           "description" : "Client ID to access Google GeoCoding server.",
           "type" : "string"
@@ -15858,11 +15194,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "branch-name" : {
           "description" : "The branch name to work on",
           "type" : "string"
@@ -15932,23 +15263,39 @@
         },
         "type" : {
           "description" : "What git operation to execute",
-          "enum" : [ "CLOSEPULLREQUEST", "PULLREQUESTCOMMENT", "COMMIT", "PULLREQUEST", "TAG", "PULLREQUESTSTATE", "PULLREQUESTFILES", "GETCOMMITFILE", "CREATEISSUE" ],
+          "enum" : [ "CLOSEPULLREQUEST", "PULLREQUESTCOMMENT", "COMMIT", "PULLREQUEST", "TAG", "PULLREQUESTSTATE", "PULLREQUESTFILES", "GETCOMMITFILE", "CREATEISSUE", "EVENT" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
+        "backoff-error-threshold" : {
+          "description" : "The number of subsequent error polls (failed due some error) that should happen before the backoffMultipler should kick-in.",
+          "type" : "integer"
+        },
+        "backoff-idle-threshold" : {
+          "description" : "The number of subsequent idle polls that should happen before the backoffMultipler should kick-in.",
+          "type" : "integer"
+        },
+        "backoff-multiplier" : {
+          "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
+          "type" : "integer"
         },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
           "type" : "boolean"
         },
+        "delay" : {
+          "description" : "Milliseconds before the next poll.",
+          "default" : "500",
+          "type" : "integer"
+        },
         "encoding" : {
           "description" : "To use the given encoding when getting a git commit file",
           "type" : "string"
         },
+        "event-fetch-strategy" : {
+          "description" : "To specify a custom strategy that configures how the EventsConsumer fetches events.",
+          "type" : "string"
+        },
         "exception-handler" : {
           "description" : "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
           "type" : "string"
@@ -15958,6 +15305,16 @@
           "enum" : [ "InOnly", "InOut", "InOptionalOut" ],
           "type" : "string"
         },
+        "greedy" : {
+          "description" : "If greedy is enabled, then the ScheduledPollConsumer will run immediately again, if the previous run polled 1 or more messages.",
+          "default" : "false",
+          "type" : "boolean"
+        },
+        "initial-delay" : {
+          "description" : "Milliseconds before the first poll starts.",
+          "default" : "1000",
+          "type" : "integer"
+        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -15971,6 +15328,15 @@
           "description" : "GitHub password, required unless oauthToken is provided",
           "type" : "string"
         },
+        "poll-strategy" : {
+          "description" : "A pluggable org.apache.camel.PollingConsumerPollingStrategy allowing you to provide your custom implementation to control error handling usually occurred during the poll operation before an Exchange have been created and being routed in Camel.",
+          "type" : "string"
+        },
+        "repeat-count" : {
+          "description" : "Specifies a maximum limit of number of fires. So if you set it to 1, the scheduler will only fire once. If you set it to 5, it will only fire five times. A value of zero or negative means fire forever.",
+          "default" : "0",
+          "type" : "integer"
+        },
         "repo-name" : {
           "description" : "GitHub repository name",
           "type" : "string"
@@ -15979,6 +15345,35 @@
           "description" : "GitHub repository owner (organization)",
           "type" : "string"
         },
+        "run-logging-level" : {
+          "description" : "The consumer logs a start/complete log line when it polls. This option allows you to configure the logging level for that.",
+          "default" : "TRACE",
+          "enum" : [ "TRACE", "DEBUG", "INFO", "WARN", "ERROR", "OFF" ],
+          "type" : "string"
+        },
+        "scheduled-executor-service" : {
+          "description" : "Allows for configuring a custom/shared thread pool to use for the consumer. By default each consumer has its own single threaded thread pool.",
+          "type" : "string"
+        },
+        "scheduler" : {
+          "description" : "To use a cron scheduler from either camel-spring or camel-quartz component. Use value spring or quartz for built in scheduler",
+          "default" : "none",
+          "type" : "string"
+        },
+        "scheduler-properties" : {
+          "description" : "To configure additional properties when using a custom scheduler or any of the Quartz, Spring based scheduler.",
+          "type" : "string"
+        },
+        "send-empty-message-when-idle" : {
+          "description" : "If the polling consumer did not poll any files, you can enable this option to send an empty message (no body) instead.",
+          "default" : "false",
+          "type" : "boolean"
+        },
+        "start-scheduler" : {
+          "description" : "Whether the scheduler should be auto started.",
+          "default" : "true",
+          "type" : "boolean"
+        },
         "state" : {
           "description" : "To set git commit status state",
           "enum" : [ "error", "failure", "pending", "success" ],
@@ -15993,6 +15388,17 @@
           "description" : "To set git commit status target url",
           "type" : "string"
         },
+        "time-unit" : {
+          "description" : "Time unit for initialDelay and delay options.",
+          "default" : "MILLISECONDS",
+          "enum" : [ "NANOSECONDS", "MICROSECONDS", "MILLISECONDS", "SECONDS", "MINUTES", "HOURS", "DAYS" ],
+          "type" : "string"
+        },
+        "use-fixed-delay" : {
+          "description" : "Controls if fixed delay or fixed rate is used. See ScheduledExecutorService in JDK for details.",
+          "default" : "true",
+          "type" : "boolean"
+        },
         "username" : {
           "description" : "GitHub username, required unless oauthToken is provided",
           "type" : "string"
@@ -16016,13 +15422,8 @@
           "description" : "BigQuery table id",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "connection-factory" : {
-          "description" : "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+          "description" : "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
           "type" : "string"
         },
         "lazy-start-producer" : {
@@ -16053,13 +15454,8 @@
           "description" : "BigQuery standard SQL query",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "connection-factory" : {
-          "description" : "ConnectionFactory to obtain connection to Bigquery Service. If non provided the default one will be used",
+          "description" : "ConnectionFactory to obtain connection to Bigquery Service. If not provided the default one will be used",
           "type" : "string"
         },
         "lazy-start-producer" : {
@@ -16108,11 +15504,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -16264,11 +15655,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -16428,11 +15814,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -16581,11 +15962,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -16720,11 +16096,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -16859,11 +16230,6 @@
           "enum" : [ "AUTO", "NONE" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -16897,6 +16263,10 @@
           "default" : "1",
           "type" : "integer"
         },
+        "serializer" : {
+          "description" : "A custom GooglePubsubSerializer to use for serializing message payloads in the producer",
+          "type" : "string"
+        },
         "synchronous" : {
           "description" : "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
           "default" : "false",
@@ -16943,11 +16313,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17087,11 +16452,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17235,11 +16595,6 @@
           "description" : "Instance name",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17344,11 +16699,6 @@
           "description" : "Maven coordinates to use as default to grab if the message body is empty.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -17373,10 +16723,10 @@
           "description" : "The access token sent in the Authorization header.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
+        "jwt-authorization-type" : {
+          "description" : "The JWT Authorization type. Default is Bearer.",
+          "default" : "Bearer",
+          "type" : "string"
         },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
@@ -17440,9 +16790,9 @@
           "enum" : [ "NONE", "GOOGLE", "JWT" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
+        "auto-discover-client-interceptors" : {
+          "description" : "Setting the autoDiscoverClientInterceptors mechanism, if true, the component will look for a ClientInterceptor instance in the registry automatically otherwise it will skip that checking.",
+          "default" : "true",
           "type" : "boolean"
         },
         "bridge-error-handler" : {
@@ -17541,6 +16891,11 @@
           "enum" : [ "SIMPLE", "STREAMING" ],
           "type" : "string"
         },
+        "route-controlled-stream-observer" : {
+          "description" : "Lets the route to take control over stream observer. If this value is set to true, then the response observer of gRPC call will be set with the name GrpcConstants.GRPC_RESPONSE_OBSERVER in the Exchange object. Please note that the stream observer's onNext(), onError(), onCompleted() methods should be called in the route.",
+          "default" : "false",
+          "type" : "boolean"
+        },
         "service-account-resource" : {
           "description" : "Service Account key file in JSON format resource link supported by the Google Cloud SDK",
           "type" : "string"
@@ -17571,11 +16926,6 @@
           "description" : "To lookup the Guava EventBus from the registry with the given name",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17618,11 +16968,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "default-operation" : {
           "description" : "To specify a default operation to use, if no operation header has been provided.",
           "enum" : [ "put", "delete", "get", "update", "query", "getAll", "clear", "putIfAbsent", "allAll", "removeAll", "retainAll", "evict", "evictAll", "valueCount", "containsKey", "containsValue", "keySet", "removevalue", "increment", "decrement", "setvalue", "destroy", "compareAndSet", "getAndAdd", "add", "offer", "peek", "poll", "remainingCapacity", "drainTo", "removeIf", "take", "publish", "readOnceHeal", "readOnceTail", "capacity" ],
@@ -17656,11 +17001,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17703,11 +17043,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17755,11 +17090,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17807,11 +17137,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17859,11 +17184,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17927,11 +17247,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -17979,11 +17294,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "default-operation" : {
           "description" : "To specify a default operation to use, if no operation header has been provided.",
           "enum" : [ "put", "delete", "get", "update", "query", "getAll", "clear", "putIfAbsent", "allAll", "removeAll", "retainAll", "evict", "evictAll", "valueCount", "containsKey", "containsValue", "keySet", "removevalue", "increment", "decrement", "setvalue", "destroy", "compareAndSet", "getAndAdd", "add", "offer", "peek", "poll", "remainingCapacity", "drainTo", "removeIf", "take", "publish", "readOnceHeal", "readOnceTail", "capacity" ],
@@ -18017,11 +17327,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -18094,11 +17399,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -18146,11 +17446,6 @@
           "description" : "The name of the cache",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -18203,11 +17498,6 @@
           "description" : "The name of the table",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -18320,11 +17610,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "block-size" : {
           "description" : "The size of the HDFS blocks",
           "default" : "67108864",
@@ -18573,11 +17858,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-endpoint" : {
           "description" : "If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back.",
           "default" : "false",
@@ -18806,11 +18086,6 @@
           "enum" : [ "SIZE_1", "SIZE_2" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -18921,11 +18196,6 @@
           "enum" : [ "SIZE_1", "SIZE_2" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -19036,11 +18306,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -19129,11 +18394,6 @@
           "description" : "The endpoint ID (not used).",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cluster-group-expression" : {
           "description" : "An expression that returns the Cluster Group for the IgniteCompute instance.",
           "type" : "string"
@@ -19184,11 +18444,6 @@
           "description" : "The endpoint ID (not used).",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -19237,11 +18492,6 @@
           "description" : "The sequence name.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "batch-size" : {
           "description" : "The batch size.",
           "type" : "integer"
@@ -19286,11 +18536,6 @@
           "description" : "The topic name.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -19349,11 +18594,6 @@
           "description" : "The queue name.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "capacity" : {
           "description" : "The queue capacity. Default: non-bounded.",
           "type" : "integer"
@@ -19401,11 +18641,6 @@
           "description" : "The set name.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "configuration" : {
           "description" : "The collection configuration. Default: empty configuration. You can also conveniently set inner properties by using configuration.xyz=123 options.",
           "type" : "string"
@@ -19478,11 +18713,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bcc" : {
           "description" : "Sets the BCC email address. Separate multiple email addresses with comma.",
           "type" : "string"
@@ -19784,11 +19014,6 @@
           "description" : "The name of the cache to use. Use current to use the existing cache name from the currently configured cached manager. Or use default for the default cache manager name.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -19929,11 +19154,6 @@
           "description" : "Connection to the influx database, of class InfluxDB.class",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "batch" : {
           "description" : "Define if this operation is a batch operation or not",
           "default" : "false",
@@ -19977,11 +19197,6 @@
           "description" : "Component name",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "depth" : {
           "description" : "The depth determines how deep the tangle is analysed for getting Tips",
           "default" : "9",
@@ -20031,11 +19246,6 @@
           "enum" : [ "add", "cat", "get", "version" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -20069,11 +19279,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -20221,11 +19426,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "batch-delete" : {
           "description" : "Should messages be deleted in one batch. This will limit the number of api requests since messages are deleted in one request, instead of one pr. exchange. If enabled care should be taken that the consumer is idempotent when processing exchanges.",
           "default" : "false",
@@ -20382,11 +19582,6 @@
           "description" : "attachId to use when retrieving attachments",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -20526,11 +19721,6 @@
           "description" : "To configure using a cache operation by default. If an operation in the message header, then the operation from the header takes precedence.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -20647,11 +19837,6 @@
           "description" : "The name of the cloud provider that provides the target service (e.g. aws-s3 or aws_ec2).",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "blob-name" : {
           "description" : "The name of the blob.",
           "type" : "string"
@@ -20734,11 +19919,6 @@
           "description" : "Name of the javax.jcr.Repository to lookup from the Camel registry to be used.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -20823,11 +20003,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bean-row-mapper" : {
           "description" : "To use a custom org.apache.camel.component.jdbc.BeanRowMapper when using outputClass. The default implementation will lower case the row names and skip underscores, and dashes. For example CUST_ID is mapped as custId.",
           "type" : "string"
@@ -20904,11 +20079,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -21068,11 +20238,6 @@
           "description" : "The name of the JGroups cluster the component should connect to.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -21116,11 +20281,6 @@
           "description" : "The name of the JGroupsraft cluster the component should connect to.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -21160,11 +20320,6 @@
           "description" : "URL to a local resource on the classpath or a full URL to a remote resource or resource on the file system which contains the schema to validate against.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "compact-syntax" : {
           "description" : "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)",
           "default" : "false",
@@ -21195,11 +20350,6 @@
           "description" : "(OAuth only) The access token generated by the Jira server.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -21348,11 +20498,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "cache-level" : {
           "description" : "Sets the cache level by ID for the underlying JMS resources. See cacheLevelName option for more details.",
           "type" : "integer"
@@ -21751,11 +20896,6 @@
           "description" : "Server url comes from the remaining endpoint. Use platform to connect to local JVM.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -21912,11 +21052,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Sets whether to use resource content cache or not",
           "default" : "false",
@@ -21971,11 +21106,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -22105,11 +21235,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -22329,11 +21454,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Sets whether to use resource content cache or not",
           "default" : "false",
@@ -22369,11 +21489,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Sets whether to use resource content cache or not",
           "default" : "false",
@@ -22426,11 +21541,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Sets whether to use resource content cache or not",
           "default" : "false",
@@ -22497,11 +21607,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -22689,11 +21794,6 @@
           "enum" : [ "latest", "earliest", "none" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "break-on-first-error" : {
           "description" : "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 a poison message. The [...]
           "default" : "false",
@@ -22781,10 +21881,18 @@
           "description" : "A string that uniquely identifies the group of consumer processes to which this consumer belongs. By setting the same group id multiple processes indicate that they are all part of the same consumer group. This option is required for consumers.",
           "type" : "string"
         },
+        "header-deserializer" : {
+          "description" : "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
+          "type" : "string"
+        },
         "header-filter-strategy" : {
           "description" : "To use a custom HeaderFilterStrategy to filter header to and from Camel message.",
           "type" : "string"
         },
+        "header-serializer" : {
+          "description" : "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
+          "type" : "string"
+        },
         "heartbeat-interval-ms" : {
           "description" : "The expected time between heartbeats to the consumer coordinator when using Kafka's group management facilities. Heartbeats are used to ensure that the consumer's session stays active and to facilitate rebalancing when new consumers join or leave the group. The value must be set lower than session.timeout.ms, but typically should be set no higher than 1/3 of that value. It can be adjusted even lower to control the expected time for normal rebalances.",
           "default" : "3000",
@@ -22794,14 +21902,6 @@
           "description" : "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",
           "type" : "string"
         },
-        "kafka-header-deserializer" : {
-          "description" : "To use a custom KafkaHeaderDeserializer to deserialize kafka headers values",
-          "type" : "string"
-        },
-        "kafka-header-serializer" : {
-          "description" : "To use a custom KafkaHeaderSerializer to serialize kafka headers values",
-          "type" : "string"
-        },
         "kerberos-before-relogin-min-time" : {
           "description" : "Login thread sleep time between refresh attempts.",
           "default" : "60000",
@@ -22836,7 +21936,7 @@
           "default" : "org.apache.kafka.common.serialization.StringDeserializer",
           "type" : "string"
         },
-        "key-serializer-class" : {
+        "key-serializer" : {
           "description" : "The serializer class for keys (defaults to the same as for messages if nothing is given).",
           "default" : "org.apache.kafka.common.serialization.StringSerializer",
           "type" : "string"
@@ -23005,11 +22105,6 @@
           "default" : "131072",
           "type" : "integer"
         },
-        "serializer-class" : {
-          "description" : "The serializer class for messages.",
-          "default" : "org.apache.kafka.common.serialization.StringSerializer",
-          "type" : "string"
-        },
         "session-timeout-ms" : {
           "description" : "The timeout used to detect failures when using Kafka's group management facilities.",
           "default" : "10000",
@@ -23105,6 +22200,11 @@
           "default" : "org.apache.kafka.common.serialization.StringDeserializer",
           "type" : "string"
         },
+        "value-serializer" : {
+          "description" : "The serializer class for messages.",
+          "default" : "org.apache.kafka.common.serialization.StringSerializer",
+          "type" : "string"
+        },
         "worker-pool" : {
           "description" : "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. If using this option then you must handle the lifecycle of the thread pool to shut the pool down when no longer needed.",
           "type" : "string"
@@ -23133,11 +22233,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "ca-cert-data" : {
           "description" : "The CA Cert Data",
           "type" : "string"
@@ -23223,7 +22318,7 @@
         }
       }
     },
-    "kubernetes-deployments" : {
+    "kubernetes-custom-resources" : {
       "type" : "object",
       "required" : [ "masterUrl" ],
       "properties" : {
@@ -23235,11 +22330,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -23281,6 +22371,26 @@
           "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
           "type" : "integer"
         },
+        "crd-group" : {
+          "description" : "The Consumer CRD Resource Group we would like to watch",
+          "type" : "string"
+        },
+        "crd-name" : {
+          "description" : "The Consumer CRD Resource name we would like to watch",
+          "type" : "string"
+        },
+        "crd-plural" : {
+          "description" : "The Consumer CRD Resource Plural we would like to watch",
+          "type" : "string"
+        },
+        "crd-scope" : {
+          "description" : "The Consumer CRD Resource Scope we would like to watch",
+          "type" : "string"
+        },
+        "crd-version" : {
+          "description" : "The Consumer CRD Resource Version we would like to watch",
+          "type" : "string"
+        },
         "dns-domain" : {
           "description" : "The dns domain, used for ServiceCall EIP",
           "type" : "string"
@@ -23360,7 +22470,7 @@
         }
       }
     },
-    "kubernetes-hpa" : {
+    "kubernetes-deployments" : {
       "type" : "object",
       "required" : [ "masterUrl" ],
       "properties" : {
@@ -23372,11 +22482,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -23418,6 +22523,26 @@
           "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
           "type" : "integer"
         },
+        "crd-group" : {
+          "description" : "The Consumer CRD Resource Group we would like to watch",
+          "type" : "string"
+        },
+        "crd-name" : {
+          "description" : "The Consumer CRD Resource name we would like to watch",
+          "type" : "string"
+        },
+        "crd-plural" : {
+          "description" : "The Consumer CRD Resource Plural we would like to watch",
+          "type" : "string"
+        },
+        "crd-scope" : {
+          "description" : "The Consumer CRD Resource Scope we would like to watch",
+          "type" : "string"
+        },
+        "crd-version" : {
+          "description" : "The Consumer CRD Resource Version we would like to watch",
+          "type" : "string"
+        },
         "dns-domain" : {
           "description" : "The dns domain, used for ServiceCall EIP",
           "type" : "string"
@@ -23497,7 +22622,7 @@
         }
       }
     },
-    "kubernetes-job" : {
+    "kubernetes-hpa" : {
       "type" : "object",
       "required" : [ "masterUrl" ],
       "properties" : {
@@ -23509,11 +22634,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -23555,6 +22675,26 @@
           "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
           "type" : "integer"
         },
+        "crd-group" : {
+          "description" : "The Consumer CRD Resource Group we would like to watch",
+          "type" : "string"
+        },
+        "crd-name" : {
+          "description" : "The Consumer CRD Resource name we would like to watch",
+          "type" : "string"
+        },
+        "crd-plural" : {
+          "description" : "The Consumer CRD Resource Plural we would like to watch",
+          "type" : "string"
+        },
+        "crd-scope" : {
+          "description" : "The Consumer CRD Resource Scope we would like to watch",
+          "type" : "string"
+        },
+        "crd-version" : {
+          "description" : "The Consumer CRD Resource Version we would like to watch",
+          "type" : "string"
+        },
         "dns-domain" : {
           "description" : "The dns domain, used for ServiceCall EIP",
           "type" : "string"
@@ -23634,7 +22774,7 @@
         }
       }
     },
-    "kubernetes-namespaces" : {
+    "kubernetes-job" : {
       "type" : "object",
       "required" : [ "masterUrl" ],
       "properties" : {
@@ -23646,11 +22786,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -23692,6 +22827,26 @@
           "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
           "type" : "integer"
         },
+        "crd-group" : {
+          "description" : "The Consumer CRD Resource Group we would like to watch",
+          "type" : "string"
+        },
+        "crd-name" : {
+          "description" : "The Consumer CRD Resource name we would like to watch",
+          "type" : "string"
+        },
+        "crd-plural" : {
+          "description" : "The Consumer CRD Resource Plural we would like to watch",
+          "type" : "string"
+        },
+        "crd-scope" : {
+          "description" : "The Consumer CRD Resource Scope we would like to watch",
+          "type" : "string"
+        },
+        "crd-version" : {
+          "description" : "The Consumer CRD Resource Version we would like to watch",
+          "type" : "string"
+        },
         "dns-domain" : {
           "description" : "The dns domain, used for ServiceCall EIP",
           "type" : "string"
@@ -23771,7 +22926,7 @@
         }
       }
     },
-    "kubernetes-nodes" : {
+    "kubernetes-namespaces" : {
       "type" : "object",
       "required" : [ "masterUrl" ],
       "properties" : {
@@ -23783,11 +22938,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -23829,6 +22979,26 @@
           "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
           "type" : "integer"
         },
+        "crd-group" : {
+          "description" : "The Consumer CRD Resource Group we would like to watch",
+          "type" : "string"
+        },
+        "crd-name" : {
+          "description" : "The Consumer CRD Resource name we would like to watch",
+          "type" : "string"
+        },
+        "crd-plural" : {
+          "description" : "The Consumer CRD Resource Plural we would like to watch",
+          "type" : "string"
+        },
+        "crd-scope" : {
+          "description" : "The Consumer CRD Resource Scope we would like to watch",
+          "type" : "string"
+        },
+        "crd-version" : {
+          "description" : "The Consumer CRD Resource Version we would like to watch",
+          "type" : "string"
+        },
         "dns-domain" : {
           "description" : "The dns domain, used for ServiceCall EIP",
           "type" : "string"
@@ -23908,7 +23078,7 @@
         }
       }
     },
-    "kubernetes-persistent-volumes" : {
+    "kubernetes-nodes" : {
       "type" : "object",
       "required" : [ "masterUrl" ],
       "properties" : {
@@ -23920,8 +23090,8 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+        "bridge-error-handler" : {
+          "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
           "type" : "boolean"
         },
@@ -23961,19 +23131,60 @@
           "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
           "type" : "integer"
         },
+        "crd-group" : {
+          "description" : "The Consumer CRD Resource Group we would like to watch",
+          "type" : "string"
+        },
+        "crd-name" : {
+          "description" : "The Consumer CRD Resource name we would like to watch",
+          "type" : "string"
+        },
+        "crd-plural" : {
+          "description" : "The Consumer CRD Resource Plural we would like to watch",
+          "type" : "string"
+        },
+        "crd-scope" : {
+          "description" : "The Consumer CRD Resource Scope we would like to watch",
+          "type" : "string"
+        },
+        "crd-version" : {
+          "description" : "The Consumer CRD Resource Version we would like to watch",
+          "type" : "string"
+        },
         "dns-domain" : {
           "description" : "The dns domain, used for ServiceCall EIP",
           "type" : "string"
         },
+        "exception-handler" : {
+          "description" : "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
+          "type" : "string"
+        },
+        "exchange-pattern" : {
+          "description" : "Sets the exchange pattern when the consumer creates an exchange.",
+          "enum" : [ "InOnly", "InOut", "InOptionalOut" ],
+          "type" : "string"
+        },
         "kubernetes-client" : {
           "description" : "Default KubernetesClient to use if provided",
           "type" : "string"
         },
+        "label-key" : {
+          "description" : "The Consumer Label key when watching at some resources",
+          "type" : "string"
+        },
+        "label-value" : {
+          "description" : "The Consumer Label value when watching at some resources",
+          "type" : "string"
+        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
           "type" : "boolean"
         },
+        "namespace" : {
+          "description" : "The namespace",
+          "type" : "string"
+        },
         "oauth-token" : {
           "description" : "The Auth Token",
           "type" : "string"
@@ -23986,6 +23197,11 @@
           "description" : "Password to connect to Kubernetes",
           "type" : "string"
         },
+        "pool-size" : {
+          "description" : "The Consumer pool size",
+          "default" : "1",
+          "type" : "integer"
+        },
         "port-name" : {
           "description" : "The port name, used for ServiceCall EIP",
           "type" : "string"
@@ -23995,6 +23211,10 @@
           "default" : "tcp",
           "type" : "string"
         },
+        "resource-name" : {
+          "description" : "The Consumer Resource Name we would like to watch",
+          "type" : "string"
+        },
         "synchronous" : {
           "description" : "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
           "default" : "false",
@@ -24010,7 +23230,7 @@
         }
       }
     },
-    "kubernetes-persistent-volumes-claims" : {
+    "kubernetes-persistent-volumes" : {
       "type" : "object",
       "required" : [ "masterUrl" ],
       "properties" : {
@@ -24022,11 +23242,103 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+        "ca-cert-data" : {
+          "description" : "The CA Cert Data",
+          "type" : "string"
+        },
+        "ca-cert-file" : {
+          "description" : "The CA Cert File",
+          "type" : "string"
+        },
+        "client-cert-data" : {
+          "description" : "The Client Cert Data",
+          "type" : "string"
+        },
+        "client-cert-file" : {
+          "description" : "The Client Cert File",
+          "type" : "string"
+        },
+        "client-key-algo" : {
+          "description" : "The Key Algorithm used by the client",
+          "type" : "string"
+        },
+        "client-key-data" : {
+          "description" : "The Client Key data",
+          "type" : "string"
+        },
+        "client-key-file" : {
+          "description" : "The Client Key file",
+          "type" : "string"
+        },
+        "client-key-passphrase" : {
+          "description" : "The Client Key Passphrase",
+          "type" : "string"
+        },
+        "connection-timeout" : {
+          "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
+          "type" : "integer"
+        },
+        "dns-domain" : {
+          "description" : "The dns domain, used for ServiceCall EIP",
+          "type" : "string"
+        },
+        "kubernetes-client" : {
+          "description" : "Default KubernetesClient to use if provided",
+          "type" : "string"
+        },
+        "lazy-start-producer" : {
+          "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
           "type" : "boolean"
         },
+        "oauth-token" : {
+          "description" : "The Auth Token",
+          "type" : "string"
+        },
+        "operation" : {
+          "description" : "Producer operation to do on Kubernetes",
+          "type" : "string"
+        },
+        "password" : {
+          "description" : "Password to connect to Kubernetes",
+          "type" : "string"
+        },
+        "port-name" : {
+          "description" : "The port name, used for ServiceCall EIP",
+          "type" : "string"
+        },
+        "port-protocol" : {
+          "description" : "The port protocol, used for ServiceCall EIP",
+          "default" : "tcp",
+          "type" : "string"
+        },
+        "synchronous" : {
+          "description" : "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+          "default" : "false",
+          "type" : "boolean"
+        },
+        "trust-certs" : {
+          "description" : "Define if the certs we used are trusted anyway or not",
+          "type" : "boolean"
+        },
+        "username" : {
+          "description" : "Username to connect to Kubernetes",
+          "type" : "string"
+        }
+      }
+    },
+    "kubernetes-persistent-volumes-claims" : {
+      "type" : "object",
+      "required" : [ "masterUrl" ],
+      "properties" : {
+        "master-url" : {
+          "description" : "Kubernetes Master url",
+          "type" : "string"
+        },
+        "api-version" : {
+          "description" : "The Kubernetes API Version to use",
+          "type" : "string"
+        },
         "ca-cert-data" : {
           "description" : "The CA Cert Data",
           "type" : "string"
@@ -24124,11 +23436,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -24170,6 +23477,26 @@
           "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
           "type" : "integer"
         },
+        "crd-group" : {
+          "description" : "The Consumer CRD Resource Group we would like to watch",
+          "type" : "string"
+        },
+        "crd-name" : {
+          "description" : "The Consumer CRD Resource name we would like to watch",
+          "type" : "string"
+        },
+        "crd-plural" : {
+          "description" : "The Consumer CRD Resource Plural we would like to watch",
+          "type" : "string"
+        },
+        "crd-scope" : {
+          "description" : "The Consumer CRD Resource Scope we would like to watch",
+          "type" : "string"
+        },
+        "crd-version" : {
+          "description" : "The Consumer CRD Resource Version we would like to watch",
+          "type" : "string"
+        },
         "dns-domain" : {
           "description" : "The dns domain, used for ServiceCall EIP",
           "type" : "string"
@@ -24261,11 +23588,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -24307,6 +23629,26 @@
           "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
           "type" : "integer"
         },
+        "crd-group" : {
+          "description" : "The Consumer CRD Resource Group we would like to watch",
+          "type" : "string"
+        },
+        "crd-name" : {
+          "description" : "The Consumer CRD Resource name we would like to watch",
+          "type" : "string"
+        },
+        "crd-plural" : {
+          "description" : "The Consumer CRD Resource Plural we would like to watch",
+          "type" : "string"
+        },
+        "crd-scope" : {
+          "description" : "The Consumer CRD Resource Scope we would like to watch",
+          "type" : "string"
+        },
+        "crd-version" : {
+          "description" : "The Consumer CRD Resource Version we would like to watch",
+          "type" : "string"
+        },
         "dns-domain" : {
           "description" : "The dns domain, used for ServiceCall EIP",
           "type" : "string"
@@ -24398,11 +23740,103 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+        "ca-cert-data" : {
+          "description" : "The CA Cert Data",
+          "type" : "string"
+        },
+        "ca-cert-file" : {
+          "description" : "The CA Cert File",
+          "type" : "string"
+        },
+        "client-cert-data" : {
+          "description" : "The Client Cert Data",
+          "type" : "string"
+        },
+        "client-cert-file" : {
+          "description" : "The Client Cert File",
+          "type" : "string"
+        },
+        "client-key-algo" : {
+          "description" : "The Key Algorithm used by the client",
+          "type" : "string"
+        },
+        "client-key-data" : {
+          "description" : "The Client Key data",
+          "type" : "string"
+        },
+        "client-key-file" : {
+          "description" : "The Client Key file",
+          "type" : "string"
+        },
+        "client-key-passphrase" : {
+          "description" : "The Client Key Passphrase",
+          "type" : "string"
+        },
+        "connection-timeout" : {
+          "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
+          "type" : "integer"
+        },
+        "dns-domain" : {
+          "description" : "The dns domain, used for ServiceCall EIP",
+          "type" : "string"
+        },
+        "kubernetes-client" : {
+          "description" : "Default KubernetesClient to use if provided",
+          "type" : "string"
+        },
+        "lazy-start-producer" : {
+          "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
           "type" : "boolean"
         },
+        "oauth-token" : {
+          "description" : "The Auth Token",
+          "type" : "string"
+        },
+        "operation" : {
+          "description" : "Producer operation to do on Kubernetes",
+          "type" : "string"
+        },
+        "password" : {
+          "description" : "Password to connect to Kubernetes",
+          "type" : "string"
+        },
+        "port-name" : {
+          "description" : "The port name, used for ServiceCall EIP",
+          "type" : "string"
+        },
+        "port-protocol" : {
+          "description" : "The port protocol, used for ServiceCall EIP",
+          "default" : "tcp",
+          "type" : "string"
+        },
+        "synchronous" : {
+          "description" : "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
+          "default" : "false",
+          "type" : "boolean"
+        },
+        "trust-certs" : {
+          "description" : "Define if the certs we used are trusted anyway or not",
+          "type" : "boolean"
+        },
+        "username" : {
+          "description" : "Username to connect to Kubernetes",
+          "type" : "string"
+        }
+      }
+    },
+    "kubernetes-secrets" : {
+      "type" : "object",
+      "required" : [ "masterUrl" ],
+      "properties" : {
+        "master-url" : {
+          "description" : "Kubernetes Master url",
+          "type" : "string"
+        },
+        "api-version" : {
+          "description" : "The Kubernetes API Version to use",
+          "type" : "string"
+        },
         "ca-cert-data" : {
           "description" : "The CA Cert Data",
           "type" : "string"
@@ -24488,7 +23922,7 @@
         }
       }
     },
-    "kubernetes-secrets" : {
+    "kubernetes-service-accounts" : {
       "type" : "object",
       "required" : [ "masterUrl" ],
       "properties" : {
@@ -24500,11 +23934,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "ca-cert-data" : {
           "description" : "The CA Cert Data",
           "type" : "string"
@@ -24590,7 +24019,7 @@
         }
       }
     },
-    "kubernetes-service-accounts" : {
+    "kubernetes-services" : {
       "type" : "object",
       "required" : [ "masterUrl" ],
       "properties" : {
@@ -24602,8 +24031,8 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
+        "bridge-error-handler" : {
+          "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
           "type" : "boolean"
         },
@@ -24643,113 +24072,26 @@
           "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
           "type" : "integer"
         },
-        "dns-domain" : {
-          "description" : "The dns domain, used for ServiceCall EIP",
+        "crd-group" : {
+          "description" : "The Consumer CRD Resource Group we would like to watch",
           "type" : "string"
         },
-        "kubernetes-client" : {
-          "description" : "Default KubernetesClient to use if provided",
+        "crd-name" : {
+          "description" : "The Consumer CRD Resource name we would like to watch",
           "type" : "string"
         },
-        "lazy-start-producer" : {
-          "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
-          "default" : "false",
-          "type" : "boolean"
-        },
-        "oauth-token" : {
-          "description" : "The Auth Token",
-          "type" : "string"
-        },
-        "operation" : {
-          "description" : "Producer operation to do on Kubernetes",
-          "type" : "string"
-        },
-        "password" : {
-          "description" : "Password to connect to Kubernetes",
+        "crd-plural" : {
+          "description" : "The Consumer CRD Resource Plural we would like to watch",
           "type" : "string"
         },
-        "port-name" : {
-          "description" : "The port name, used for ServiceCall EIP",
+        "crd-scope" : {
+          "description" : "The Consumer CRD Resource Scope we would like to watch",
           "type" : "string"
         },
-        "port-protocol" : {
-          "description" : "The port protocol, used for ServiceCall EIP",
-          "default" : "tcp",
+        "crd-version" : {
+          "description" : "The Consumer CRD Resource Version we would like to watch",
           "type" : "string"
         },
-        "synchronous" : {
-          "description" : "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported).",
-          "default" : "false",
-          "type" : "boolean"
-        },
-        "trust-certs" : {
-          "description" : "Define if the certs we used are trusted anyway or not",
-          "type" : "boolean"
-        },
-        "username" : {
-          "description" : "Username to connect to Kubernetes",
-          "type" : "string"
-        }
-      }
-    },
-    "kubernetes-services" : {
-      "type" : "object",
-      "required" : [ "masterUrl" ],
-      "properties" : {
-        "master-url" : {
-          "description" : "Kubernetes Master url",
-          "type" : "string"
-        },
-        "api-version" : {
-          "description" : "The Kubernetes API Version to use",
-          "type" : "string"
-        },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
-        "bridge-error-handler" : {
-          "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
-          "default" : "false",
-          "type" : "boolean"
-        },
-        "ca-cert-data" : {
-          "description" : "The CA Cert Data",
-          "type" : "string"
-        },
-        "ca-cert-file" : {
-          "description" : "The CA Cert File",
-          "type" : "string"
-        },
-        "client-cert-data" : {
-          "description" : "The Client Cert Data",
-          "type" : "string"
-        },
-        "client-cert-file" : {
-          "description" : "The Client Cert File",
-          "type" : "string"
-        },
-        "client-key-algo" : {
-          "description" : "The Key Algorithm used by the client",
-          "type" : "string"
-        },
-        "client-key-data" : {
-          "description" : "The Client Key data",
-          "type" : "string"
-        },
-        "client-key-file" : {
-          "description" : "The Client Key file",
-          "type" : "string"
-        },
-        "client-key-passphrase" : {
-          "description" : "The Client Key Passphrase",
-          "type" : "string"
-        },
-        "connection-timeout" : {
-          "description" : "Connection timeout in milliseconds to use when making requests to the Kubernetes API server.",
-          "type" : "integer"
-        },
         "dns-domain" : {
           "description" : "The dns domain, used for ServiceCall EIP",
           "type" : "string"
@@ -24844,11 +24186,6 @@
           "description" : "Table to connect to",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -24884,11 +24221,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binary" : {
           "description" : "Whether the script is binary content or text content. By default the script is read as text content (eg java.lang.String)",
           "default" : "false",
@@ -24938,11 +24270,6 @@
           "default" : "ou=system",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -24977,11 +24304,6 @@
           "description" : "The name of the LdapConnection bean to pull from the registry. Note that this must be of scope prototype to avoid it being shared among threads or using a connection that has timed out.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -25002,11 +24324,6 @@
           "description" : "Name of the logging category to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "exchange-formatter" : {
           "description" : "To use a custom exchange formatter",
           "type" : "string"
@@ -25156,11 +24473,6 @@
           "description" : "Name of the printer",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "copies" : {
           "description" : "Number of copies to print",
           "default" : "1",
@@ -25237,11 +24549,6 @@
           "description" : "An Analyzer builds TokenStreams, which analyze text. It thus represents a policy for extracting index terms from text. The value for analyzer can be any class that extends the abstract class org.apache.lucene.analysis.Analyzer. Lucene also offers a rich set of analyzers out of the box",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "index-dir" : {
           "description" : "A file system directory in which index files are created upon analysis of the document by the specified analyzer",
           "type" : "string"
@@ -25279,11 +24586,6 @@
           "default" : "5044",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -25321,11 +24623,6 @@
           "description" : "The name of the cluster namespace to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -25365,11 +24662,6 @@
           "enum" : [ "start", "stop" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "decrement" : {
           "description" : "Decrement value when using counter type",
           "type" : "integer"
@@ -25423,11 +24715,6 @@
           "description" : "Action expression when using timer type",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "decrement" : {
           "description" : "Decrement value expression when using counter type",
           "type" : "string"
@@ -25469,11 +24756,6 @@
           "description" : "Action to use when using the timer type",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "counter-increment" : {
           "description" : "Increment value when using the counter type",
           "type" : "integer"
@@ -25548,11 +24830,6 @@
           "default" : "http://camel.apache.org/EclipseMilo/Client",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -25676,11 +24953,6 @@
           "description" : "ID of the item",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -25733,11 +25005,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -25900,11 +25167,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -26198,11 +25460,6 @@
           "default" : "5",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bind-retry-interval" : {
           "description" : "TCP Server Only - The number of milliseconds to wait between bind attempts",
           "default" : "5000",
@@ -26340,11 +25597,6 @@
           "default" : "0",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "copy-on-exchange" : {
           "description" : "Sets whether to make a deep copy of the incoming Exchange when received at this mock endpoint. Is by default true.",
           "default" : "true",
@@ -26409,11 +25661,6 @@
           "description" : "Sets the connection bean reference used to lookup a client for connecting to a database.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -26539,11 +25786,6 @@
           "description" : "Name of com.mongodb.client.MongoClient to use.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -26635,11 +25877,6 @@
           "description" : "URL to a local resource on the classpath, or a reference to lookup a bean in the Registry, or a full URL to a remote resource or resource on the file system which contains the XSD to validate against.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "error-handler" : {
           "description" : "To use a custom org.apache.camel.processor.validation.ValidatorErrorHandler. The default error handler captures the errors and throws an exception.",
           "type" : "string"
@@ -26710,11 +25947,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Sets whether to use resource content cache or not",
           "default" : "false",
@@ -26764,11 +25996,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Sets whether to use resource content cache or not",
           "default" : "false",
@@ -26810,11 +26037,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -26964,11 +26186,6 @@
           "description" : "Name of the method on the bean that has the SQL query to be executed.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "executor-type" : {
           "description" : "The executor type to be used while executing statements. simple - executor does nothing special. reuse - executor reuses prepared statements. batch - executor reuses statements and batches updates.",
           "default" : "SIMPLE",
@@ -27007,11 +26224,6 @@
           "description" : "The port number of the host.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "connection-timeout" : {
           "description" : "Connection timeout in millis.",
           "default" : "5000",
@@ -27056,11 +26268,6 @@
           "description" : "The name of topic we want to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -27184,6 +26391,11 @@
           "default" : "false",
           "type" : "boolean"
         },
+        "trace-connection" : {
+          "description" : "Whether or not connection trace messages should be printed to standard out for fine grained debugging of connection issues.",
+          "default" : "false",
+          "type" : "boolean"
+        },
         "verbose" : {
           "description" : "Whether or not running in verbose mode",
           "default" : "false",
@@ -27227,11 +26439,6 @@
           "description" : "Allows to configure a backlog for netty consumer (server). Note the backlog is just a best effort depending on the OS. Setting this option to a value such as 200, 500 or 1000, tells the TCP stack how long the accept queue can be If this option is not configured, then the backlog depends on OS setting.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "boss-count" : {
           "description" : "When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use this option to override the default bossCount from Netty",
           "default" : "1",
@@ -27572,11 +26779,6 @@
           "description" : "Allows to configure a backlog for netty consumer (server). Note the backlog is just a best effort depending on the OS. Setting this option to a value such as 200, 500 or 1000, tells the TCP stack how long the accept queue can be If this option is not configured, then the backlog depends on OS setting.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "boss-count" : {
           "description" : "When netty works on nio mode, it uses default bossCount parameter from Netty, which is 1. User can use this option to override the default bossCount from Netty",
           "default" : "1",
@@ -27944,11 +27146,6 @@
           "description" : "Path to database file. Will be created if not exists.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -28008,11 +27205,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -28114,11 +27306,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -28275,11 +27462,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -28456,11 +27638,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -28616,11 +27793,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "ca-cert-data" : {
           "description" : "The CA Cert Data",
           "type" : "string"
@@ -28718,11 +27890,6 @@
           "description" : "The Kubernetes API Version to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "ca-cert-data" : {
           "description" : "The CA Cert Data",
           "type" : "string"
@@ -28822,11 +27989,6 @@
           "enum" : [ "V2", "V3" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "config" : {
           "description" : "OpenStack configuration",
           "type" : "string"
@@ -28883,11 +28045,6 @@
           "enum" : [ "V2", "V3" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "config" : {
           "description" : "OpenStack configuration",
           "type" : "string"
@@ -28933,11 +28090,6 @@
           "description" : "OpenStack host url",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "config" : {
           "description" : "OpenStack configuration",
           "type" : "string"
@@ -28994,11 +28146,6 @@
           "enum" : [ "V2", "V3" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "config" : {
           "description" : "OpenStack configuration",
           "type" : "string"
@@ -29055,11 +28202,6 @@
           "enum" : [ "V2", "V3" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "config" : {
           "description" : "OpenStack configuration",
           "type" : "string"
@@ -29116,11 +28258,6 @@
           "enum" : [ "V2", "V3" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "config" : {
           "description" : "OpenStack configuration",
           "type" : "string"
@@ -29176,11 +28313,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -29240,11 +28372,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -29397,11 +28524,6 @@
           "enum" : [ "create", "append", "extractText" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "font" : {
           "description" : "Font",
           "default" : "Helvetica",
@@ -29500,11 +28622,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -29630,11 +28747,6 @@
           "default" : "5432",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -29682,11 +28794,6 @@
           "description" : "The path under which this endpoint serves the HTTP requests",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -29749,11 +28856,6 @@
           "description" : "If Access Manager is utilized, client will use this authKey in all restricted requests.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -29855,11 +28957,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "batcher-builder" : {
           "description" : "Control batching method used by the producer.",
           "default" : "DEFAULT",
@@ -29972,6 +29069,11 @@
           "description" : "Name of the producer. If unset, lets Pulsar select a unique identifier.",
           "type" : "string"
         },
+        "read-compacted" : {
+          "description" : "Enable compacted topic reading.",
+          "default" : "false",
+          "type" : "boolean"
+        },
         "send-timeout-ms" : {
           "description" : "Send timeout in milliseconds",
           "default" : "30000",
@@ -30029,11 +29131,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -30129,11 +29226,6 @@
           "description" : "Path to the quickfix configuration file. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the configuration file using these protocols (classpath is default). ref will lookup the configuration file in the registry. bean will call a method on a bean to be used as the configuration. For bean you can specify the method name after dot, eg bean:myBean.myMethod",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -30223,11 +29315,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-endpoint" : {
           "description" : "If the bridgeEndpoint is true, the producer will ignore the message header of rabbitmq.EXCHANGE_NAME and rabbitmq.ROUTING_KEY",
           "default" : "false",
@@ -30506,11 +29593,6 @@
           "enum" : [ "BUFFER", "OLDEST", "LATEST" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -30570,11 +29652,6 @@
           "description" : "Name of endpoint to lookup in the registry.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -30622,11 +29699,6 @@
           "description" : "The openapi api doc resource to use. The resource is loaded from classpath by default and must be in JSON format.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binding-mode" : {
           "description" : "Configures the binding mode for the producer. If set to anything other than 'off' the producer will try to convert the body of the incoming message from inType to the json or xml, and the response from json or xml to outType.",
           "enum" : [ "auto", "off", "json", "xml", "json_xml" ],
@@ -30713,11 +29785,6 @@
           "description" : "The Camel Rest API component to use for generating the API of the REST services, such as openapi.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -30761,11 +29828,6 @@
           "description" : "API basePath, for example /v2. Default is unset, if set overrides the value present in OpenApi specification and in the component configuration.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "component-name" : {
           "description" : "Name of the Camel component that will perform the requests. The component must be present in Camel registry and it must implement RestProducerFactory service provider interface. If not set CLASSPATH is searched for single component that implements RestProducerFactory SPI. Overrides component configuration.",
           "type" : "string"
@@ -30811,11 +29873,6 @@
           "description" : "API basePath, for example /v2. Default is unset, if set overrides the value present in Swagger specification and in the component configuration.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "component-name" : {
           "description" : "Name of the Camel component that will perform the requests. The component must be present in Camel registry and it must implement RestProducerFactory service provider interface. If not set CLASSPATH is searched for single component that implements RestProducerFactory SPI. Overrides component configuration.",
           "type" : "string"
@@ -30861,11 +29918,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-endpoint" : {
           "description" : "If the option is true, HttpProducer will ignore the Exchange.HTTP_URI header, and use the endpoint's URI for request. You may also set the option throwExceptionOnFailure to be false to let the HttpProducer send all the fault response back.",
           "default" : "false",
@@ -31090,11 +30142,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -31394,11 +30441,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -31530,11 +30572,6 @@
           "enum" : [ "COMPLETE", "COMPENSATE" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -31573,7 +30610,7 @@
         },
         "api-version" : {
           "description" : "Salesforce API version.",
-          "default" : "34.0",
+          "default" : "50.0",
           "type" : "string"
         },
         "backoff-increment" : {
@@ -31581,11 +30618,6 @@
           "default" : "1000",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "batch-id" : {
           "description" : "Bulk API Batch ID",
           "type" : "string"
@@ -31765,11 +30797,6 @@
           "description" : "Url to the SAP net-weaver gateway server.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "flattern-map" : {
           "description" : "If the JSON Map contains only a single entry, then flattern by storing that single entry value as the message body.",
           "default" : "true",
@@ -31825,11 +30852,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -31933,11 +30955,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -31978,11 +30995,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "chmod" : {
           "description" : "Allows you to set chmod on the stored file. For example chmod=664.",
           "default" : "664",
@@ -32095,11 +31107,6 @@
           "description" : "Name of queue",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "block-when-full" : {
           "description" : "Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will instead block and wait until the message can be accepted.",
           "default" : "false",
@@ -32203,11 +31210,6 @@
           "description" : "The endpoint uri to expose as service",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -32245,11 +31247,6 @@
           "description" : "The ServiceNow REST API version, default latest",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "date-format" : {
           "description" : "The date format used for Json serialization/deserialization",
           "default" : "yyyy-MM-dd",
@@ -32457,11 +31454,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -32613,11 +31605,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "binary" : {
           "description" : "Specifies the file transfer mode, BINARY or ASCII. Default is ASCII (false).",
           "default" : "false",
@@ -33148,11 +32135,6 @@
           "description" : "To use a custom AddressFactory",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -33387,11 +32369,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -33569,11 +32546,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -33705,11 +32677,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -33899,11 +32866,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -34046,11 +33008,6 @@
           "enum" : [ "0", "4", "8" ],
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -34266,11 +33223,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -34440,11 +33392,6 @@
           "description" : "Server side must support gzip or deflate for this to have any effect",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "collection" : {
           "description" : "Set the collection name which the solrCloud server could use",
           "type" : "string"
@@ -34547,11 +33494,6 @@
           "default" : "Exponential",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -34647,11 +33589,6 @@
           "enum" : [ "rdd", "dataframe", "hive" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "collect" : {
           "description" : "Indicates if results should be collected or counted.",
           "default" : "true",
@@ -34709,11 +33646,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -34913,11 +33845,6 @@
           "description" : "Splunk authorization token",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "host" : {
           "description" : "Splunk host.",
           "type" : "string"
@@ -34967,11 +33894,6 @@
           "description" : "The name of the Spring Batch job located in the registry.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "job-from-header" : {
           "description" : "Explicitly defines if the jobName should be taken from the headers instead of the URI.",
           "default" : "false",
@@ -35004,11 +33926,6 @@
           "description" : "Name of endpoint",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -35043,11 +33960,6 @@
           "description" : "The default channel name which is used by the Spring Integration Spring context. It will equal to the inputChannel name for the Spring Integration consumer and the outputChannel name for the Spring Integration provider.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -35095,11 +34007,6 @@
           "description" : "Name of the Spring LDAP Template bean",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -35135,11 +34042,6 @@
           "description" : "Redis server port number",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -35222,11 +34124,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -35343,11 +34240,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "batch" : {
           "description" : "Enables or disables batch mode",
           "default" : "false",
@@ -35555,11 +34447,6 @@
           "description" : "Sets the StoredProcedure template to perform",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "batch" : {
           "description" : "Enables or disables batch mode",
           "default" : "false",
@@ -35625,11 +34512,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -35784,11 +34666,6 @@
           "description" : "The FQN class name for the ContentHandler implementation to use.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -35809,11 +34686,6 @@
           "description" : "Name of the queue",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -35886,11 +34758,6 @@
           "description" : "Number of messages to process before closing stream on Producer side. Never close stream by default (only when Producer is stopped). If more messages are sent, the stream is reopened for another autoCloseCount batch.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -35996,11 +34863,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Sets whether to use resource content cache or not",
           "default" : "false",
@@ -36036,11 +34898,6 @@
           "description" : "Name of queue",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "block-when-full" : {
           "description" : "Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will instead block and wait until the message can be accepted.",
           "default" : "false",
@@ -36165,11 +35022,6 @@
           "description" : "Can be used to set an alternative base URI, e.g. when you want to test the component against a mock Telegram API",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -36312,11 +35164,6 @@
           "description" : "Fully qualified service name from the thrift descriptor file (package dot service definition name)",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -36393,11 +35240,6 @@
           "enum" : [ "parse", "detect" ],
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "lazy-start-producer" : {
           "description" : "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed then creating and startin [...]
           "default" : "false",
@@ -36436,11 +35278,6 @@
           "description" : "The name of the timer",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -36530,11 +35367,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -36657,11 +35489,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -36870,11 +35697,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -37084,11 +35906,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -37294,11 +36111,6 @@
           "description" : "Configuration used by UndertowSecurityProvider. Comma separated list of allowed roles.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -37433,11 +36245,6 @@
           "description" : "URL to a local resource on the classpath, or a reference to lookup a bean in the Registry, or a full URL to a remote resource or resource on the file system which contains the XSD to validate against.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "error-handler" : {
           "description" : "To use a custom org.apache.camel.processor.validation.ValidatorErrorHandler. The default error handler captures the errors and throws an exception.",
           "type" : "string"
@@ -37508,11 +36315,6 @@
           "default" : "false",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Sets whether to use resource content cache or not",
           "default" : "false",
@@ -37551,11 +36353,6 @@
           "description" : "Sets the event bus address used to communicate",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -37602,11 +36399,6 @@
           "description" : "The user name to use for basic authentication",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bearer-token" : {
           "description" : "The bearer token to use for bearer token authentication",
           "type" : "string"
@@ -37728,11 +36520,6 @@
           "description" : "Regex pattern to match the origin header sent by WebSocket clients",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -37742,6 +36529,10 @@
           "description" : "Sets customized options for configuring the WebSocket client used in the producer",
           "type" : "string"
         },
+        "client-sub-protocols" : {
+          "description" : "Comma separated list of WebSocket subprotocols that the client should use for the Sec-WebSocket-Protocol header",
+          "type" : "string"
+        },
         "exception-handler" : {
           "description" : "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with exceptions, that will be logged at WARN or ERROR level and ignored.",
           "type" : "string"
@@ -37789,11 +36580,6 @@
           "description" : "Name of queue",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "block-when-full" : {
           "description" : "Whether a thread that sends messages to a full SEDA queue will block until the queue's capacity is no longer exhausted. By default, an exception will be thrown stating that the queue is full. By enabling this option, the calling thread will instead block and wait until the message can be accepted.",
           "default" : "false",
@@ -37913,11 +36699,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -38111,11 +36892,6 @@
           "default" : "latest",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "block-hash" : {
           "description" : "Hash of the block where this transaction was in.",
           "type" : "string"
@@ -38279,11 +37055,6 @@
           "description" : "The delegate uri. Must belong to a component that supports webhooks.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -38347,11 +37118,6 @@
           "description" : "The CORS allowed origins. Use to allow all.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -38446,11 +37212,6 @@
           "description" : "If a schemeless URI path is provided, a ServerEndpoint is deployed under that path. Else if the URI is prefixed with the 'ws://' scheme, then a connection is established to the corresponding server",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -38495,11 +37256,6 @@
           "description" : "The filter spec (i.e. Name Options)",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "build" : {
           "description" : "The classifier spec (i.e. Name Options)",
           "type" : "string"
@@ -38566,11 +37322,6 @@
           "default" : "2",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -38639,11 +37390,6 @@
           "description" : "The API path to access an entity structure.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "client-id" : {
           "description" : "Workday client Id generated by API client for integrations.",
           "type" : "string"
@@ -38694,11 +37440,6 @@
           "description" : "The exchange to connect to",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "currency" : {
           "description" : "The currency",
           "type" : "string"
@@ -38742,11 +37483,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Cache for the resource content (the stylesheet file) when it is loaded. If set to false Camel will reload the stylesheet file on each message processing. This is good for development. A cached stylesheet can be forced to reload at runtime via JMX using the clearCachedStylesheet operation.",
           "default" : "true",
@@ -38843,11 +37579,6 @@
           "description" : "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "canonicalization-method" : {
           "description" : "Canonicalization method used to canonicalize the SignedInfo element before the digest is calculated. You can use the helper methods XmlSignatureHelper.getCanonicalizationMethod(String algorithm) or getCanonicalizationMethod(String algorithm, List inclusiveNamespacePrefixes) to create a canonicalization method.",
           "default" : "http://www.w3.org/TR/2001/REC-xml-c14n-20010315",
@@ -38976,11 +37707,6 @@
           "description" : "You can set a base URI which is used in the URI dereferencing. Relative URIs are then concatenated with the base URI.",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "clear-headers" : {
           "description" : "Determines if the XML signature specific headers be cleared after signing and verification. Defaults to true.",
           "default" : "true",
@@ -39075,11 +37801,6 @@
           "description" : "Port number for the chat server",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -39198,11 +37919,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -39348,11 +38064,6 @@
           "description" : "Path to the template. The following is supported by the default URIResolver. You can prefix with: classpath, file, http, ref, or bean. classpath, file and http loads the resource using these protocols (classpath is default). ref will lookup the resource in the registry. bean will call a method on a bean to be used as the resource. For bean you can specify the method name after dot, eg bean:myBean.myMethod",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Cache for the resource content (the stylesheet file) when it is loaded. If set to false Camel will reload the stylesheet file on each message processing. This is good for development. A cached stylesheet can be forced to reload at runtime via JMX using the clearCachedStylesheet operation.",
           "default" : "true",
@@ -39432,11 +38143,6 @@
           "default" : "true",
           "type" : "boolean"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "content-cache" : {
           "description" : "Cache for the resource content (the stylesheet file) when it is loaded. If set to false Camel will reload the stylesheet file on each message processing. This is good for development. A cached stylesheet can be forced to reload at runtime via JMX using the clearCachedStylesheet operation.",
           "default" : "true",
@@ -39536,11 +38242,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -39693,11 +38394,6 @@
           "description" : "To let the scheduled polling consumer backoff if there has been a number of subsequent idles/errors in a row. The multiplier is then the number of polls that will be skipped before the next actual attempt is happening again. When this option is in use then backoffIdleThreshold and/or backoffErrorThreshold must also be configured.",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -39829,11 +38525,6 @@
           "default" : "5000",
           "type" : "integer"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
@@ -39903,11 +38594,6 @@
           "description" : "The name of the cluster group to use",
           "type" : "string"
         },
-        "basic-property-binding" : {
-          "description" : "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities",
-          "default" : "false",
-          "type" : "boolean"
-        },
         "bridge-error-handler" : {
           "description" : "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by the routing Error 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.",
           "default" : "false",
diff --git a/camel-k-webhook/impl/src/generated/java/org/apache/camel/k/webhook/WebhookContextCustomizerConfigurer.java b/camel-k-webhook/impl/src/generated/java/org/apache/camel/k/webhook/WebhookContextCustomizerConfigurer.java
index 5d8e0d1..d33aff5 100644
--- a/camel-k-webhook/impl/src/generated/java/org/apache/camel/k/webhook/WebhookContextCustomizerConfigurer.java
+++ b/camel-k-webhook/impl/src/generated/java/org/apache/camel/k/webhook/WebhookContextCustomizerConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.k.webhook;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.k.webhook.WebhookContextCustomizer;
 
@@ -15,13 +17,6 @@ import org.apache.camel.k.webhook.WebhookContextCustomizer;
 @SuppressWarnings("unchecked")
 public class WebhookContextCustomizerConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("Action", org.apache.camel.k.webhook.WebhookAction.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         org.apache.camel.k.webhook.WebhookContextCustomizer target = (org.apache.camel.k.webhook.WebhookContextCustomizer) obj;
@@ -33,8 +28,12 @@ public class WebhookContextCustomizerConfigurer extends org.apache.camel.support
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "action":
+        case "Action": return org.apache.camel.k.webhook.WebhookAction.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-kamelet-reify/src/generated/java/org/apache/camel/component/kameletreify/KameletReifyComponentConfigurer.java b/components/camel-kamelet-reify/src/generated/java/org/apache/camel/component/kameletreify/KameletReifyComponentConfigurer.java
index 7ad26aa..044d16e 100644
--- a/components/camel-kamelet-reify/src/generated/java/org/apache/camel/component/kameletreify/KameletReifyComponentConfigurer.java
+++ b/components/camel-kamelet-reify/src/generated/java/org/apache/camel/component/kameletreify/KameletReifyComponentConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.component.kameletreify;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -15,21 +17,12 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KameletReifyComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KameletReifyComponent target = (KameletReifyComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "basicpropertybinding":
-        case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
+        case "autowiredenabled":
+        case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
         case "lazystartproducer":
@@ -39,16 +32,24 @@ public class KameletReifyComponentConfigurer extends PropertyConfigurerSupport i
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "autowiredenabled":
+        case "autowiredEnabled": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
     public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
         KameletReifyComponent target = (KameletReifyComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "basicpropertybinding":
-        case "basicPropertyBinding": return target.isBasicPropertyBinding();
+        case "autowiredenabled":
+        case "autowiredEnabled": return target.isAutowiredEnabled();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
         case "lazystartproducer":
diff --git a/components/camel-kamelet-reify/src/generated/java/org/apache/camel/component/kameletreify/KameletReifyEndpointConfigurer.java b/components/camel-kamelet-reify/src/generated/java/org/apache/camel/component/kameletreify/KameletReifyEndpointConfigurer.java
index 4602db3..493eab2 100644
--- a/components/camel-kamelet-reify/src/generated/java/org/apache/camel/component/kameletreify/KameletReifyEndpointConfigurer.java
+++ b/components/camel-kamelet-reify/src/generated/java/org/apache/camel/component/kameletreify/KameletReifyEndpointConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.component.kameletreify;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -15,25 +17,10 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KameletReifyEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("delegateUri", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KameletReifyEndpoint target = (KameletReifyEndpoint) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "basicpropertybinding":
-        case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
         case "exceptionhandler":
@@ -48,16 +35,25 @@ public class KameletReifyEndpointConfigurer extends PropertyConfigurerSupport im
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "synchronous": return boolean.class;
+        default: return null;
+        }
     }
 
     @Override
     public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
         KameletReifyEndpoint target = (KameletReifyEndpoint) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "basicpropertybinding":
-        case "basicPropertyBinding": return target.isBasicPropertyBinding();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
         case "exceptionhandler":
diff --git a/components/camel-kamelet-reify/src/generated/resources/org/apache/camel/component/kameletreify/kamelet-reify.json b/components/camel-kamelet-reify/src/generated/resources/org/apache/camel/component/kameletreify/kamelet-reify.json
index 1c2153e..19bbb58 100644
--- a/components/camel-kamelet-reify/src/generated/resources/org/apache/camel/component/kameletreify/kamelet-reify.json
+++ b/components/camel-kamelet-reify/src/generated/resources/org/apache/camel/component/kameletreify/kamelet-reify.json
@@ -22,17 +22,16 @@
     "lenientProperties": true
   },
   "componentProperties": {
-    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...]
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
-    "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }
+    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
+    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
+    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
   },
   "properties": {
-    "delegateUri": { "kind": "path", "displayName": "Delegate Uri", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The delegated uri" },
-    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...]
-    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with [...]
-    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
-    "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }
+    "delegateUri": { "kind": "path", "displayName": "Delegate Uri", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The delegated uri" },
+    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
+    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
+    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }
   }
 }
diff --git a/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletComponentConfigurer.java b/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletComponentConfigurer.java
index 9013d36..238976e 100644
--- a/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletComponentConfigurer.java
+++ b/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletComponentConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.component.kamelet;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -15,55 +17,74 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KameletComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("configuration", org.apache.camel.component.kamelet.KameletConfiguration.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("block", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("timeout", long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KameletComponent target = (KameletComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "basicpropertybinding":
-        case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
+        case "autowiredenabled":
+        case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
         case "block": target.setBlock(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
-        case "configuration": target.setConfiguration(property(camelContext, org.apache.camel.component.kamelet.KameletConfiguration.class, value)); return true;
         case "lazystartproducer":
         case "lazyStartProducer": target.setLazyStartProducer(property(camelContext, boolean.class, value)); return true;
+        case "routeproperties":
+        case "routeProperties": target.setRouteProperties(property(camelContext, java.util.Map.class, value)); return true;
+        case "templateproperties":
+        case "templateProperties": target.setTemplateProperties(property(camelContext, java.util.Map.class, value)); return true;
         case "timeout": target.setTimeout(property(camelContext, long.class, value)); return true;
         default: return false;
         }
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "autowiredenabled":
+        case "autowiredEnabled": return boolean.class;
+        case "block": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "routeproperties":
+        case "routeProperties": return java.util.Map.class;
+        case "templateproperties":
+        case "templateProperties": return java.util.Map.class;
+        case "timeout": return long.class;
+        default: return null;
+        }
     }
 
     @Override
     public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
         KameletComponent target = (KameletComponent) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "basicpropertybinding":
-        case "basicPropertyBinding": return target.isBasicPropertyBinding();
+        case "autowiredenabled":
+        case "autowiredEnabled": return target.isAutowiredEnabled();
         case "block": return target.isBlock();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
-        case "configuration": return target.getConfiguration();
         case "lazystartproducer":
         case "lazyStartProducer": return target.isLazyStartProducer();
+        case "routeproperties":
+        case "routeProperties": return target.getRouteProperties();
+        case "templateproperties":
+        case "templateProperties": return target.getTemplateProperties();
         case "timeout": return target.getTimeout();
         default: return null;
         }
     }
+
+    @Override
+    public Object getCollectionValueType(Object target, String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "routeproperties":
+        case "routeProperties": return java.util.Properties.class;
+        case "templateproperties":
+        case "templateProperties": return java.util.Properties.class;
+        default: return null;
+        }
+    }
 }
 
diff --git a/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletConfigurationConfigurer.java b/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletConfigurationConfigurer.java
deleted file mode 100644
index 956450f..0000000
--- a/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletConfigurationConfigurer.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.kamelet;
-
-import java.util.Map;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-import org.apache.camel.spi.PropertyConfigurerGetter;
-import org.apache.camel.util.CaseInsensitiveMap;
-import org.apache.camel.component.kamelet.KameletConfiguration;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public class KameletConfigurationConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
-
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("RouteProperties", java.util.Map.class);
-        map.put("TemplateProperties", java.util.Map.class);
-        ALL_OPTIONS = map;
-    }
-
-    @Override
-    public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
-        org.apache.camel.component.kamelet.KameletConfiguration target = (org.apache.camel.component.kamelet.KameletConfiguration) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "routeproperties":
-        case "RouteProperties": target.setRouteProperties(property(camelContext, java.util.Map.class, value)); return true;
-        case "templateproperties":
-        case "TemplateProperties": target.setTemplateProperties(property(camelContext, java.util.Map.class, value)); return true;
-        default: return false;
-        }
-    }
-
-    @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
-    }
-
-    @Override
-    public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
-        org.apache.camel.component.kamelet.KameletConfiguration target = (org.apache.camel.component.kamelet.KameletConfiguration) obj;
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "routeproperties":
-        case "RouteProperties": return target.getRouteProperties();
-        case "templateproperties":
-        case "TemplateProperties": return target.getTemplateProperties();
-        default: return null;
-        }
-    }
-
-    @Override
-    public Object getCollectionValueType(Object target, String name, boolean ignoreCase) {
-        switch (ignoreCase ? name.toLowerCase() : name) {
-        case "routeproperties":
-        case "RouteProperties": return java.util.Properties.class;
-        case "templateproperties":
-        case "TemplateProperties": return java.util.Properties.class;
-        default: return null;
-        }
-    }
-}
-
diff --git a/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java b/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java
index 0af67b2..159a871 100644
--- a/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java
+++ b/components/camel-kamelet/src/generated/java/org/apache/camel/component/kamelet/KameletEndpointConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.component.kamelet;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -15,29 +17,10 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KameletEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("templateId", java.lang.String.class);
-        map.put("routeId", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("block", boolean.class);
-        map.put("failIfNoConsumers", boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("timeout", long.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KameletEndpoint target = (KameletEndpoint) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "basicpropertybinding":
-        case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
         case "block": target.setBlock(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
@@ -56,16 +39,29 @@ public class KameletEndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "block": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "failifnoconsumers":
+        case "failIfNoConsumers": return boolean.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "timeout": return long.class;
+        default: return null;
+        }
     }
 
     @Override
     public Object getOptionValue(Object obj, String name, boolean ignoreCase) {
         KameletEndpoint target = (KameletEndpoint) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
-        case "basicpropertybinding":
-        case "basicPropertyBinding": return target.isBasicPropertyBinding();
         case "block": return target.isBlock();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
diff --git a/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.kamelet.KameletConfiguration b/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.kamelet.KameletConfiguration
deleted file mode 100644
index 7b71d91..0000000
--- a/components/camel-kamelet/src/generated/resources/META-INF/services/org/apache/camel/configurer/org.apache.camel.component.kamelet.KameletConfiguration
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-class=org.apache.camel.component.kamelet.KameletConfigurationConfigurer
diff --git a/components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json b/components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
index 948fa42..4ed8146 100644
--- a/components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
+++ b/components/camel-kamelet/src/generated/resources/org/apache/camel/component/kamelet/kamelet.json
@@ -22,24 +22,24 @@
     "lenientProperties": true
   },
   "componentProperties": {
-    "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.kamelet.KameletConfiguration", "deprecated": false, "secret": false, "description": "The configuration." },
-    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...]
-    "block": { "kind": "property", "displayName": "Block", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "If sending a message to a kamelet endpoint which has no active consumer, then we can tell the producer to block and wait for the consumer to become active." },
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
-    "timeout": { "kind": "property", "displayName": "Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 30000, "description": "The timeout value to use if block is enabled." },
-    "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" }
+    "routeProperties": { "kind": "property", "displayName": "Route Properties", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.util.Properties>", "deprecated": false, "autowired": false, "secret": false, "description": "Set route local parameters." },
+    "templateProperties": { "kind": "property", "displayName": "Template Properties", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.util.Properties>", "deprecated": false, "autowired": false, "secret": false, "description": "Set template local parameters." },
+    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
+    "block": { "kind": "property", "displayName": "Block", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "If sending a message to a kamelet endpoint which has no active consumer, then we can tell the producer to block and wait for the consumer to become active." },
+    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
+    "timeout": { "kind": "property", "displayName": "Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "description": "The timeout value to use if block is enabled." },
+    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
   },
   "properties": {
-    "templateId": { "kind": "path", "displayName": "Template Id", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The Route Template ID" },
-    "routeId": { "kind": "path", "displayName": "Route Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "secret": false, "description": "The Route ID. Default value notice: The ID will be auto-generated if not provided" },
-    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...]
-    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with [...]
-    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "block": { "kind": "parameter", "displayName": "Block", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "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." },
-    "failIfNoConsumers": { "kind": "parameter", "displayName": "Fail If No Consumers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": true, "description": "Whether the producer should fail by throwing an exception, when sending to a kamelet endpoint with no active consumers." },
-    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
-    "timeout": { "kind": "parameter", "displayName": "Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "secret": false, "defaultValue": 30000, "description": "The timeout value to use if block is enabled." },
-    "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }
+    "templateId": { "kind": "path", "displayName": "Template Id", "group": "common", "label": "", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The Route Template ID" },
+    "routeId": { "kind": "path", "displayName": "Route Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "deprecationNote": "", "autowired": false, "secret": false, "description": "The Route ID. Default value notice: The ID will be auto-generated if not provided" },
+    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
+    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
+    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+    "block": { "kind": "parameter", "displayName": "Block", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "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." },
+    "failIfNoConsumers": { "kind": "parameter", "displayName": "Fail If No Consumers", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the producer should fail by throwing an exception, when sending to a kamelet endpoint with no active consumers." },
+    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
+    "timeout": { "kind": "parameter", "displayName": "Timeout", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "long", "deprecated": false, "autowired": false, "secret": false, "defaultValue": 30000, "description": "The timeout value to use if block is enabled." },
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }
   }
 }
diff --git a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java
index 2823bf5..8611f73 100644
--- a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java
+++ b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/Kamelet.java
@@ -16,22 +16,19 @@
  */
 package org.apache.camel.component.kamelet;
 
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Properties;
-import java.util.StringJoiner;
 import java.util.function.Predicate;
 
 import org.apache.camel.CamelContext;
 import org.apache.camel.model.FromDefinition;
-import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.model.RouteTemplateDefinition;
-import org.apache.camel.model.RouteTemplateParameterDefinition;
 import org.apache.camel.model.ToDefinition;
 import org.apache.camel.spi.PropertiesComponent;
 import org.apache.camel.support.CamelContextHelper;
+import org.apache.camel.util.ObjectHelper;
 import org.apache.camel.util.StringHelper;
 
 import static org.apache.camel.model.ProcessorDefinitionHelper.filterTypeInOutputs;
@@ -87,7 +84,7 @@ public final class Kamelet {
         return answer;
     }
 
-    public static Map<String, Object> extractKameletProperties(CamelContext context, Map<String, Object> properties, String... elements) {
+    public static void extractKameletProperties(CamelContext context, Map<String, Object> properties, String... elements) {
         PropertiesComponent pc = context.getPropertiesComponent();
         String prefix = Kamelet.PROPERTIES_PREFIX;
 
@@ -103,71 +100,32 @@ public final class Kamelet {
                 properties.put(name.substring(prefix.length()), prefixed.getProperty(name));
             }
         }
-
-        return properties;
     }
 
-    public static String addRouteFromTemplate(ModelCamelContext context, String routeId, String routeTemplateId, Map<String, Object> parameters) throws Exception {
-        RouteTemplateDefinition target = null;
-        for (RouteTemplateDefinition def : context.getRouteTemplateDefinitions()) {
-            if (routeTemplateId.equals(def.getId())) {
-                target = def;
-                break;
-            }
-        }
-        if (target == null) {
-            throw new IllegalArgumentException("Cannot find RouteTemplate with id " + routeTemplateId);
-        }
+    public static RouteDefinition templateToRoute(RouteTemplateDefinition in, Map<String, Object> parameters) {
+        final String rid = (String)parameters.get(PARAM_ROUTE_ID);
+        final String tid = (String)parameters.get(PARAM_TEMPLATE_ID);
 
-        StringJoiner templatesBuilder = new StringJoiner(", ");
-        final Map<String, Object> prop = new HashMap<>();
-        // include default values first from the template (and validate that we have inputs for all required parameters)
-        if (target.getTemplateParameters() != null) {
-            for (RouteTemplateParameterDefinition temp : target.getTemplateParameters()) {
-                if (temp.getDefaultValue() != null) {
-                    prop.put(temp.getName(), temp.getDefaultValue());
-                } else {
-                    // this is a required parameter do we have that as input
-                    if (!parameters.containsKey(temp.getName())) {
-                        templatesBuilder.add(temp.getName());
-                    }
-                }
-            }
-        }
-        if (templatesBuilder.length() > 0) {
-            throw new IllegalArgumentException(
-                "Route template " + routeTemplateId + " the following mandatory parameters must be provided: "
-                    + templatesBuilder.toString());
-        }
-        // then override with user parameters
-        if (parameters != null) {
-            prop.putAll(parameters);
-        }
+        ObjectHelper.notNull(rid, PARAM_ROUTE_ID);
+        ObjectHelper.notNull(tid, PARAM_TEMPLATE_ID);
+
+        RouteDefinition def = in.asRouteDefinition();
+        def.setId(rid);
 
-        RouteDefinition def = target.asRouteDefinition();
-        // must make deep copy of input
-        def.setInput(null);
-        def.setInput(new FromDefinition(target.getRoute().getInput().getEndpointUri()));
-        if (routeId != null) {
-            def.setId(routeId);
-        }
         // must make the source and sink endpoints are unique by appending the route id before we create the route from the template
-        if (def.getInput().getEndpointUri().startsWith("kamelet:source") || def.getInput().getEndpointUri().startsWith("kamelet//source")) {
-            def.getInput().setUri("kamelet:source?" + PARAM_ROUTE_ID + "=" + routeId);
+        if (def.getInput().getEndpointUri().startsWith("kamelet:source") || def.getInput().getEndpointUri().startsWith("kamelet://source")) {
+            def.setInput(null);
+            def.setInput(new FromDefinition("kamelet:source?" + PARAM_ROUTE_ID + "=" + rid));
         }
+
         Iterator<ToDefinition> it = filterTypeInOutputs(def.getOutputs(), ToDefinition.class);
         while (it.hasNext()) {
             ToDefinition to = it.next();
             if (to.getEndpointUri().startsWith("kamelet:sink") || to.getEndpointUri().startsWith("kamelet://sink")) {
-                to.setUri("kamelet:sink?" + PARAM_ROUTE_ID + "=" + routeId);
+                to.setUri("kamelet:sink?" + PARAM_ROUTE_ID + "=" + rid);
             }
         }
 
-        def.setTemplateParameters(prop);
-        context.removeRouteDefinition(def);
-        context.getRouteDefinitions().add(def);
-
-        return def.getId();
+        return def;
     }
-
 }
diff --git a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
index c60ae71..24dcd42 100644
--- a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
+++ b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletComponent.java
@@ -16,7 +16,6 @@
  */
 package org.apache.camel.component.kamelet;
 
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -24,7 +23,6 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.apache.camel.AfterPropertiesConfigured;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Endpoint;
 import org.apache.camel.RuntimeCamelException;
@@ -32,21 +30,16 @@ import org.apache.camel.VetoCamelContextStartException;
 import org.apache.camel.model.ModelCamelContext;
 import org.apache.camel.model.RouteDefinition;
 import org.apache.camel.spi.Metadata;
-import org.apache.camel.spi.PropertiesComponent;
 import org.apache.camel.spi.annotations.Component;
 import org.apache.camel.support.DefaultComponent;
-import org.apache.camel.support.DefaultEndpoint;
 import org.apache.camel.support.LifecycleStrategySupport;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.StopWatch;
-import org.apache.camel.util.URISupport;
-import org.apache.camel.util.UnsafeUriCharactersEncoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import static org.apache.camel.component.kamelet.Kamelet.PARAM_ROUTE_ID;
 import static org.apache.camel.component.kamelet.Kamelet.PARAM_TEMPLATE_ID;
-import static org.apache.camel.component.kamelet.Kamelet.addRouteFromTemplate;
 
 /**
  * The Kamelet Component provides support for materializing routes templates.
@@ -71,108 +64,14 @@ public class KameletComponent extends DefaultComponent {
     private long timeout = 30000L;
 
     @Metadata
-    private KameletConfiguration configuration;
+    private Map<String, Properties> templateProperties;
+    @Metadata
+    private Map<String, Properties> routeProperties;
 
     public KameletComponent() {
     }
 
     @Override
-    public Endpoint createEndpoint(String uri, Map<String, Object> properties) throws Exception {
-        // need to encode before its safe to parse with java.net.Uri
-        String encodedUri = UnsafeUriCharactersEncoder.encode(uri);
-        URI u = new URI(encodedUri);
-        String path;
-        if (u.getScheme() != null) {
-            // if there is a scheme then there is also a path
-            path = URISupport.extractRemainderPath(u, useRawUri());
-        } else {
-            // this uri has no context-path as the leading text is the component name (scheme)
-            path = null;
-        }
-
-        // use encoded or raw uri?
-        Map<String, Object> parameters;
-        if (useRawUri()) {
-            // when using raw uri then the query is taking from the uri as is
-            String query;
-            int idx = uri.indexOf('?');
-            if (idx > -1) {
-                query = uri.substring(idx + 1);
-            } else {
-                query = u.getRawQuery();
-            }
-            // and use method parseQuery
-            parameters = URISupport.parseQuery(query, true);
-        } else {
-            // however when using the encoded (default mode) uri then the query,
-            // is taken from the URI (ensures values is URI encoded)
-            // and use method parseParameters
-            parameters = URISupport.parseParameters(u);
-        }
-        if (properties != null) {
-            parameters.putAll(properties);
-        }
-        // This special property is only to identify endpoints in a unique manner
-        parameters.remove("hash");
-
-        // use encoded or raw uri?
-        uri = useRawUri() ? uri : encodedUri;
-
-        validateURI(uri, path, parameters);
-        if (LOGGER.isTraceEnabled()) {
-            // at trace level its okay to have parameters logged, that may contain passwords
-            LOGGER.trace("Creating endpoint uri=[{}], path=[{}], parameters=[{}]", URISupport.sanitizeUri(uri),
-                URISupport.sanitizePath(path), parameters);
-        } else if (LOGGER.isDebugEnabled()) {
-            // but at debug level only output sanitized uris
-            LOGGER.debug("Creating endpoint uri=[{}], path=[{}]", URISupport.sanitizeUri(uri), URISupport.sanitizePath(path));
-        }
-
-        // extract these global options and infer their value based on global/component level configuration
-        boolean basic = getAndRemoveParameter(parameters, "basicPropertyBinding", boolean.class, isBasicPropertyBinding()
-            ? isBasicPropertyBinding() : getCamelContext().getGlobalEndpointConfiguration().isBasicPropertyBinding());
-        boolean bridge = getAndRemoveParameter(parameters, "bridgeErrorHandler", boolean.class, isBridgeErrorHandler()
-            ? isBridgeErrorHandler() : getCamelContext().getGlobalEndpointConfiguration().isBridgeErrorHandler());
-        boolean lazy = getAndRemoveParameter(parameters, "lazyStartProducer", boolean.class, isLazyStartProducer()
-            ? isLazyStartProducer() : getCamelContext().getGlobalEndpointConfiguration().isLazyStartProducer());
-
-        // create endpoint
-        Endpoint endpoint = createEndpoint(uri, path, parameters);
-        if (endpoint == null) {
-            return null;
-        }
-        // inject camel context
-        endpoint.setCamelContext(getCamelContext());
-
-        // and setup those global options afterwards
-        if (endpoint instanceof DefaultEndpoint) {
-            DefaultEndpoint de = (DefaultEndpoint) endpoint;
-            de.setBasicPropertyBinding(basic);
-            de.setBridgeErrorHandler(bridge);
-            de.setLazyStartProducer(lazy);
-        }
-
-        URISupport.resolveRawParameterValues(parameters);
-
-        // configure remainder of the parameters
-        setProperties(endpoint, parameters);
-
-        // if endpoint is strict (not lenient) and we have unknown parameters configured then
-        // fail if there are parameters that could not be set, then they are probably misspell or not supported at all
-        if (!endpoint.isLenientProperties()) {
-            validateParameters(uri, parameters, null);
-        }
-
-        // allow custom configuration after properties has been configured
-        if (endpoint instanceof AfterPropertiesConfigured) {
-            ((AfterPropertiesConfigured) endpoint).afterPropertiesConfigured(getCamelContext());
-        }
-
-        afterConfiguration(uri, path, endpoint, parameters);
-        return endpoint;
-    }
-
-    @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
         final String templateId = Kamelet.extractTemplateId(getCamelContext(), remaining, parameters);
         final String routeId = Kamelet.extractRouteId(getCamelContext(), remaining, parameters);
@@ -237,17 +136,17 @@ public class KameletComponent extends DefaultComponent {
             // Load properties from the component configuration. Template and route specific properties
             // can be set through properties, as example:
             //
-            //     camel.component.kamelet.configuration.template-properties[templateId].key = val
-            //     camel.component.kamelet.configuration.route-properties[templateId].key = val
+            //     camel.component.kamelet.template-properties[templateId].key = val
+            //     camel.component.kamelet.route-properties[templateId].key = val
             //
-            if (configuration != null && configuration.getTemplateProperties() != null) {
-                Properties props = configuration.getTemplateProperties().get(routeId);
+            if (templateProperties != null) {
+                Properties props = templateProperties.get(routeId);
                 if (props != null) {
                     props.stringPropertyNames().forEach(name -> kameletProperties.put(name, props.get(name)));
                 }
             }
-            if (configuration != null && configuration.getRouteProperties() != null) {
-                Properties props = configuration.getRouteProperties().get(routeId);
+            if (routeProperties != null) {
+                Properties props = routeProperties.get(routeId);
                 if (props != null) {
                     props.stringPropertyNames().forEach(name -> kameletProperties.put(name, props.get(name)));
                 }
@@ -283,11 +182,25 @@ public class KameletComponent extends DefaultComponent {
 
             // set kamelet specific properties
             endpoint.setKameletProperties(kameletProperties);
+
+            //
+            // Add a custom converter to convert a RouteTemplateDefinition to a RouteDefinition
+            // and make sure consumerU URIs are unique.
+            //
+            getCamelContext().adapt(ModelCamelContext.class).addRouteTemplateDefinitionConverter(
+                templateId,
+                Kamelet::templateToRoute
+            );
         }
 
         return endpoint;
     }
 
+    @Override
+    protected boolean resolveRawParameterValues() {
+        return false;
+    }
+
     public boolean isBlock() {
         return block;
     }
@@ -311,15 +224,27 @@ public class KameletComponent extends DefaultComponent {
         this.timeout = timeout;
     }
 
-    public KameletConfiguration getConfiguration() {
-        return configuration;
+
+    public Map<String, Properties> getTemplateProperties() {
+        return templateProperties;
     }
 
     /**
-     * The configuration.
+     * Set template local parameters.
      */
-    public void setConfiguration(KameletConfiguration configuration) {
-        this.configuration = configuration;
+    public void setTemplateProperties(Map<String, Properties> templateProperties) {
+        this.templateProperties = templateProperties;
+    }
+
+    public Map<String, Properties> getRouteProperties() {
+        return routeProperties;
+    }
+
+    /**
+     * Set route local parameters.
+     */
+    public void setRouteProperties(Map<String, Properties> routeProperties) {
+        this.routeProperties = routeProperties;
     }
 
     int getStateCounter() {
@@ -442,24 +367,11 @@ public class KameletComponent extends DefaultComponent {
             LOGGER.debug("Creating route from template={} and id={}", endpoint.getTemplateId(), endpoint.getRouteId());
 
             final ModelCamelContext context = endpoint.getCamelContext().adapt(ModelCamelContext.class);
-            final String id = addRouteFromTemplate(context, endpoint.getRouteId(), endpoint.getTemplateId(), endpoint.getKameletProperties());
+            final String id = context.addRouteFromTemplate(endpoint.getRouteId(), endpoint.getTemplateId(), endpoint.getKameletProperties());
             final RouteDefinition def = context.getRouteDefinition(id);
 
             if (!def.isPrepared()) {
-                // when starting the route that was created from the template
-                // then we must provide the route id as local properties to the
-                // properties component as this route id is used internal by
-                // kamelets when they are starting
-                PropertiesComponent pc = context.getPropertiesComponent();
-                try {
-                    Properties prop = new Properties();
-                    prop.put(PARAM_TEMPLATE_ID, endpoint.getTemplateId());
-                    prop.put(PARAM_ROUTE_ID, id);
-                    pc.setLocalProperties(prop);
-                    context.startRouteDefinitions(List.of(def));
-                } finally {
-                    pc.setLocalProperties(null);
-                }
+                context.startRouteDefinitions(List.of(def));
             }
 
             LOGGER.debug("Route with id={} created from template={}", id, endpoint.getTemplateId());
diff --git a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletConfiguration.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletConfiguration.java
deleted file mode 100644
index 4a73226..0000000
--- a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/KameletConfiguration.java
+++ /dev/null
@@ -1,44 +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.component.kamelet;
-
-import java.util.Map;
-import java.util.Properties;
-
-import org.apache.camel.spi.Configurer;
-
-@Configurer
-public class KameletConfiguration {
-    private Map<String, Properties> templateProperties;
-    private Map<String, Properties> routeProperties;
-
-    public Map<String, Properties> getTemplateProperties() {
-        return templateProperties;
-    }
-
-    public void setTemplateProperties(Map<String, Properties> templateProperties) {
-        this.templateProperties = templateProperties;
-    }
-
-    public Map<String, Properties> getRouteProperties() {
-        return routeProperties;
-    }
-
-    public void setRouteProperties(Map<String, Properties> routeProperties) {
-        this.routeProperties = routeProperties;
-    }
-}
diff --git a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/support/PropertiesConfigurer.java b/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/support/PropertiesConfigurer.java
deleted file mode 100644
index 50fff27..0000000
--- a/components/camel-kamelet/src/main/java/org/apache/camel/component/kamelet/support/PropertiesConfigurer.java
+++ /dev/null
@@ -1,30 +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.component.kamelet.support;
-
-import java.util.Properties;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
-
-public class PropertiesConfigurer implements GeneratedPropertyConfigurer {
-    @Override
-    public boolean configure(CamelContext camelContext, Object target, String name, Object value, boolean ignoreCase) {
-        ((Properties) target).put(name, value);
-        return true;
-    }
-}
diff --git a/components/camel-kamelet/src/main/resources/META-INF/services/org/apache/camel/configurer/java.util.Properties b/components/camel-kamelet/src/main/resources/META-INF/services/org/apache/camel/configurer/java.util.Properties
deleted file mode 100644
index f308c08..0000000
--- a/components/camel-kamelet/src/main/resources/META-INF/services/org/apache/camel/configurer/java.util.Properties
+++ /dev/null
@@ -1,18 +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.
-#
-
-class=org.apache.camel.component.kamelet.support.PropertiesConfigurer
\ No newline at end of file
diff --git a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletComponentTest.java b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletComponentTest.java
index 9382e58..086bbd4 100644
--- a/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletComponentTest.java
+++ b/components/camel-kamelet/src/test/java/org/apache/camel/component/kamelet/KameletComponentTest.java
@@ -39,17 +39,17 @@ public class KameletComponentTest {
             .withTarget(component)
             .withConfigurer(component.getComponentPropertyConfigurer())
             .withProperties(Map.of(
-                "configuration.template-properties[myTemplate].foo", "bar",
-                "configuration.route-properties[myRoute].foo", "baz"
+                "template-properties[myTemplate].foo", "bar",
+                "route-properties[myRoute].foo", "baz"
             ))
             .bind();
 
 
-        assertThat(component.getConfiguration().getTemplateProperties()).isNotEmpty();
-        assertThat(component.getConfiguration().getTemplateProperties()).containsKey("myTemplate");
-        assertThat(component.getConfiguration().getTemplateProperties().get("myTemplate")).containsEntry("foo", "bar");
-        assertThat(component.getConfiguration().getRouteProperties()).isNotEmpty();
-        assertThat(component.getConfiguration().getRouteProperties()).containsKey("myRoute");
-        assertThat(component.getConfiguration().getRouteProperties().get("myRoute")).containsEntry("foo", "baz");
+        assertThat(component.getTemplateProperties()).isNotEmpty();
+        assertThat(component.getTemplateProperties()).containsKey("myTemplate");
+        assertThat(component.getTemplateProperties().get("myTemplate")).containsEntry("foo", "bar");
+        assertThat(component.getRouteProperties()).isNotEmpty();
+        assertThat(component.getRouteProperties()).containsKey("myRoute");
+        assertThat(component.getRouteProperties().get("myRoute")).containsEntry("foo", "baz");
     }
 }
diff --git a/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/CloudEventTypeConverterLoader.java b/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/CloudEventTypeConverterLoader.java
deleted file mode 100644
index 7e5df28..0000000
--- a/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/CloudEventTypeConverterLoader.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Generated by camel build tools - do NOT edit this file! */
-package org.apache.camel.component.knative.spi;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.TypeConversionException;
-import org.apache.camel.TypeConverterLoaderException;
-import org.apache.camel.spi.TypeConverterLoader;
-import org.apache.camel.spi.TypeConverterRegistry;
-import org.apache.camel.support.SimpleTypeConverter;
-import org.apache.camel.support.TypeConverterSupport;
-import org.apache.camel.util.DoubleMap;
-
-/**
- * Generated by camel build tools - do NOT edit this file!
- */
-@SuppressWarnings("unchecked")
-public final class CloudEventTypeConverterLoader implements TypeConverterLoader {
-
-    public CloudEventTypeConverterLoader() {
-    }
-
-    @Override
-    public void load(TypeConverterRegistry registry) throws TypeConverterLoaderException {
-        registerConverters(registry);
-    }
-
-    private void registerConverters(TypeConverterRegistry registry) {
-        addTypeConverter(registry, org.apache.camel.component.knative.spi.CloudEvent.class, java.lang.String.class, false,
-            (type, exchange, value) -> org.apache.camel.component.knative.spi.CloudEventTypeConverter.fromSpecVersion((java.lang.String) value));
-    }
-
-    private static void addTypeConverter(TypeConverterRegistry registry, Class<?> toType, Class<?> fromType, boolean allowNull, SimpleTypeConverter.ConversionMethod method) { 
-        registry.addTypeConverter(toType, fromType, new SimpleTypeConverter(allowNull, method));
-    }
-
-}
diff --git a/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/KnativeEnvironmentConfigurer.java b/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/KnativeEnvironmentConfigurer.java
index 216453f..d9098cd 100644
--- a/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/KnativeEnvironmentConfigurer.java
+++ b/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/KnativeEnvironmentConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.component.knative.spi;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.knative.spi.KnativeEnvironment;
 
@@ -15,13 +17,6 @@ import org.apache.camel.component.knative.spi.KnativeEnvironment;
 @SuppressWarnings("unchecked")
 public class KnativeEnvironmentConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("Resources", java.util.List.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         org.apache.camel.component.knative.spi.KnativeEnvironment target = (org.apache.camel.component.knative.spi.KnativeEnvironment) obj;
@@ -33,8 +28,12 @@ public class KnativeEnvironmentConfigurer extends org.apache.camel.support.compo
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "resources":
+        case "Resources": return java.util.List.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/KnativeResourceConfigurer.java b/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/KnativeResourceConfigurer.java
index cb0b849..2f66314 100644
--- a/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/KnativeResourceConfigurer.java
+++ b/components/camel-knative/camel-knative-api/src/generated/java/org/apache/camel/component/knative/spi/KnativeResourceConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.component.knative.spi;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.component.knative.spi.KnativeResource;
 
@@ -15,26 +17,6 @@ import org.apache.camel.component.knative.spi.KnativeResource;
 @SuppressWarnings("unchecked")
 public class KnativeResourceConfigurer extends org.apache.camel.support.component.PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("CeOverrides", java.util.Map.class);
-        map.put("CloudEventType", java.lang.String.class);
-        map.put("ContentType", java.lang.String.class);
-        map.put("EndpointKind", org.apache.camel.component.knative.spi.Knative.EndpointKind.class);
-        map.put("Filters", java.util.Map.class);
-        map.put("Metadata", java.util.Map.class);
-        map.put("Name", java.lang.String.class);
-        map.put("ObjectApiVersion", java.lang.String.class);
-        map.put("ObjectKind", java.lang.String.class);
-        map.put("ObjectName", java.lang.String.class);
-        map.put("Path", java.lang.String.class);
-        map.put("Reply", java.lang.Boolean.class);
-        map.put("Type", org.apache.camel.component.knative.spi.Knative.Type.class);
-        map.put("Url", java.lang.String.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         org.apache.camel.component.knative.spi.KnativeResource target = (org.apache.camel.component.knative.spi.KnativeResource) obj;
@@ -72,8 +54,38 @@ public class KnativeResourceConfigurer extends org.apache.camel.support.componen
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "ceoverrides":
+        case "CeOverrides": return java.util.Map.class;
+        case "cloudeventtype":
+        case "CloudEventType": return java.lang.String.class;
+        case "contenttype":
+        case "ContentType": return java.lang.String.class;
+        case "endpointkind":
+        case "EndpointKind": return org.apache.camel.component.knative.spi.Knative.EndpointKind.class;
+        case "filters":
+        case "Filters": return java.util.Map.class;
+        case "metadata":
+        case "Metadata": return java.util.Map.class;
+        case "name":
+        case "Name": return java.lang.String.class;
+        case "objectapiversion":
+        case "ObjectApiVersion": return java.lang.String.class;
+        case "objectkind":
+        case "ObjectKind": return java.lang.String.class;
+        case "objectname":
+        case "ObjectName": return java.lang.String.class;
+        case "path":
+        case "Path": return java.lang.String.class;
+        case "reply":
+        case "Reply": return java.lang.Boolean.class;
+        case "type":
+        case "Type": return org.apache.camel.component.knative.spi.Knative.Type.class;
+        case "url":
+        case "Url": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
diff --git a/components/camel-knative/camel-knative-api/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader b/components/camel-knative/camel-knative-api/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
deleted file mode 100644
index 3944526..0000000
--- a/components/camel-knative/camel-knative-api/src/generated/resources/META-INF/services/org/apache/camel/TypeConverterLoader
+++ /dev/null
@@ -1,2 +0,0 @@
-# Generated by camel build tools - do NOT edit this file!
-org.apache.camel.component.knative.spi.CloudEventTypeConverterLoader
diff --git a/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeComponentConfigurer.java b/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeComponentConfigurer.java
index f3eb5a1..7834929 100644
--- a/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeComponentConfigurer.java
+++ b/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeComponentConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.component.knative;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -15,31 +17,6 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KnativeComponentConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("ceOverride", java.util.Map.class);
-        map.put("cloudEventsSpecVersion", java.lang.String.class);
-        map.put("cloudEventsType", java.lang.String.class);
-        map.put("configuration", org.apache.camel.component.knative.KnativeConfiguration.class);
-        map.put("consumerFactory", org.apache.camel.component.knative.spi.KnativeConsumerFactory.class);
-        map.put("environment", org.apache.camel.component.knative.spi.KnativeEnvironment.class);
-        map.put("environmentPath", java.lang.String.class);
-        map.put("filters", java.util.Map.class);
-        map.put("producerFactory", org.apache.camel.component.knative.spi.KnativeProducerFactory.class);
-        map.put("transportOptions", java.util.Map.class);
-        map.put("typeId", java.lang.String.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("replyWithCloudEvent", boolean.class);
-        map.put("reply", java.lang.Boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("apiVersion", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("kind", java.lang.String.class);
-        map.put("name", java.lang.String.class);
-        ALL_OPTIONS = map;
-    }
-
     private org.apache.camel.component.knative.KnativeConfiguration getOrCreateConfiguration(KnativeComponent target) {
         if (target.getConfiguration() == null) {
             target.setConfiguration(new org.apache.camel.component.knative.KnativeConfiguration());
@@ -53,8 +30,8 @@ public class KnativeComponentConfigurer extends PropertyConfigurerSupport implem
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "apiversion":
         case "apiVersion": getOrCreateConfiguration(target).setApiVersion(property(camelContext, java.lang.String.class, value)); return true;
-        case "basicpropertybinding":
-        case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
+        case "autowiredenabled":
+        case "autowiredEnabled": target.setAutowiredEnabled(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
         case "ceoverride":
@@ -88,8 +65,42 @@ public class KnativeComponentConfigurer extends PropertyConfigurerSupport implem
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "apiversion":
+        case "apiVersion": return java.lang.String.class;
+        case "autowiredenabled":
+        case "autowiredEnabled": return boolean.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "ceoverride":
+        case "ceOverride": return java.util.Map.class;
+        case "cloudeventsspecversion":
+        case "cloudEventsSpecVersion": return java.lang.String.class;
+        case "cloudeventstype":
+        case "cloudEventsType": return java.lang.String.class;
+        case "configuration": return org.apache.camel.component.knative.KnativeConfiguration.class;
+        case "consumerfactory":
+        case "consumerFactory": return org.apache.camel.component.knative.spi.KnativeConsumerFactory.class;
+        case "environment": return org.apache.camel.component.knative.spi.KnativeEnvironment.class;
+        case "environmentpath":
+        case "environmentPath": return java.lang.String.class;
+        case "filters": return java.util.Map.class;
+        case "kind": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "name": return java.lang.String.class;
+        case "producerfactory":
+        case "producerFactory": return org.apache.camel.component.knative.spi.KnativeProducerFactory.class;
+        case "reply": return java.lang.Boolean.class;
+        case "replywithcloudevent":
+        case "replyWithCloudEvent": return boolean.class;
+        case "transportoptions":
+        case "transportOptions": return java.util.Map.class;
+        case "typeid":
+        case "typeId": return java.lang.String.class;
+        default: return null;
+        }
     }
 
     @Override
@@ -98,8 +109,8 @@ public class KnativeComponentConfigurer extends PropertyConfigurerSupport implem
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "apiversion":
         case "apiVersion": return getOrCreateConfiguration(target).getApiVersion();
-        case "basicpropertybinding":
-        case "basicPropertyBinding": return target.isBasicPropertyBinding();
+        case "autowiredenabled":
+        case "autowiredEnabled": return target.isAutowiredEnabled();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
         case "ceoverride":
@@ -131,5 +142,17 @@ public class KnativeComponentConfigurer extends PropertyConfigurerSupport implem
         default: return null;
         }
     }
+
+    @Override
+    public Object getCollectionValueType(Object target, String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "ceoverride":
+        case "ceOverride": return java.lang.String.class;
+        case "filters": return java.lang.String.class;
+        case "transportoptions":
+        case "transportOptions": return java.lang.Object.class;
+        default: return null;
+        }
+    }
 }
 
diff --git a/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeEndpointConfigurer.java b/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeEndpointConfigurer.java
index c0cfe9b..dc35af0 100644
--- a/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeEndpointConfigurer.java
+++ b/components/camel-knative/camel-knative/src/generated/java/org/apache/camel/component/knative/KnativeEndpointConfigurer.java
@@ -4,8 +4,10 @@ package org.apache.camel.component.knative;
 import java.util.Map;
 
 import org.apache.camel.CamelContext;
-import org.apache.camel.spi.GeneratedPropertyConfigurer;
+import org.apache.camel.spi.ExtendedPropertyConfigurerGetter;
 import org.apache.camel.spi.PropertyConfigurerGetter;
+import org.apache.camel.spi.ConfigurerStrategy;
+import org.apache.camel.spi.GeneratedPropertyConfigurer;
 import org.apache.camel.util.CaseInsensitiveMap;
 import org.apache.camel.support.component.PropertyConfigurerSupport;
 
@@ -15,39 +17,12 @@ import org.apache.camel.support.component.PropertyConfigurerSupport;
 @SuppressWarnings("unchecked")
 public class KnativeEndpointConfigurer extends PropertyConfigurerSupport implements GeneratedPropertyConfigurer, PropertyConfigurerGetter {
 
-    private static final Map<String, Object> ALL_OPTIONS;
-    static {
-        Map<String, Object> map = new CaseInsensitiveMap();
-        map.put("type", org.apache.camel.component.knative.spi.Knative.Type.class);
-        map.put("typeId", java.lang.String.class);
-        map.put("ceOverride", java.util.Map.class);
-        map.put("cloudEventsSpecVersion", java.lang.String.class);
-        map.put("cloudEventsType", java.lang.String.class);
-        map.put("environment", org.apache.camel.component.knative.spi.KnativeEnvironment.class);
-        map.put("filters", java.util.Map.class);
-        map.put("transportOptions", java.util.Map.class);
-        map.put("bridgeErrorHandler", boolean.class);
-        map.put("replyWithCloudEvent", boolean.class);
-        map.put("exceptionHandler", org.apache.camel.spi.ExceptionHandler.class);
-        map.put("exchangePattern", org.apache.camel.ExchangePattern.class);
-        map.put("reply", java.lang.Boolean.class);
-        map.put("lazyStartProducer", boolean.class);
-        map.put("apiVersion", java.lang.String.class);
-        map.put("basicPropertyBinding", boolean.class);
-        map.put("kind", java.lang.String.class);
-        map.put("name", java.lang.String.class);
-        map.put("synchronous", boolean.class);
-        ALL_OPTIONS = map;
-    }
-
     @Override
     public boolean configure(CamelContext camelContext, Object obj, String name, Object value, boolean ignoreCase) {
         KnativeEndpoint target = (KnativeEndpoint) obj;
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "apiversion":
         case "apiVersion": target.getConfiguration().setApiVersion(property(camelContext, java.lang.String.class, value)); return true;
-        case "basicpropertybinding":
-        case "basicPropertyBinding": target.setBasicPropertyBinding(property(camelContext, boolean.class, value)); return true;
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": target.setBridgeErrorHandler(property(camelContext, boolean.class, value)); return true;
         case "ceoverride":
@@ -77,8 +52,36 @@ public class KnativeEndpointConfigurer extends PropertyConfigurerSupport impleme
     }
 
     @Override
-    public Map<String, Object> getAllOptions(Object target) {
-        return ALL_OPTIONS;
+    public Class<?> getOptionType(String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "apiversion":
+        case "apiVersion": return java.lang.String.class;
+        case "bridgeerrorhandler":
+        case "bridgeErrorHandler": return boolean.class;
+        case "ceoverride":
+        case "ceOverride": return java.util.Map.class;
+        case "cloudeventsspecversion":
+        case "cloudEventsSpecVersion": return java.lang.String.class;
+        case "cloudeventstype":
+        case "cloudEventsType": return java.lang.String.class;
+        case "environment": return org.apache.camel.component.knative.spi.KnativeEnvironment.class;
+        case "exceptionhandler":
+        case "exceptionHandler": return org.apache.camel.spi.ExceptionHandler.class;
+        case "exchangepattern":
+        case "exchangePattern": return org.apache.camel.ExchangePattern.class;
+        case "filters": return java.util.Map.class;
+        case "kind": return java.lang.String.class;
+        case "lazystartproducer":
+        case "lazyStartProducer": return boolean.class;
+        case "name": return java.lang.String.class;
+        case "reply": return java.lang.Boolean.class;
+        case "replywithcloudevent":
+        case "replyWithCloudEvent": return boolean.class;
+        case "synchronous": return boolean.class;
+        case "transportoptions":
+        case "transportOptions": return java.util.Map.class;
+        default: return null;
+        }
     }
 
     @Override
@@ -87,8 +90,6 @@ public class KnativeEndpointConfigurer extends PropertyConfigurerSupport impleme
         switch (ignoreCase ? name.toLowerCase() : name) {
         case "apiversion":
         case "apiVersion": return target.getConfiguration().getApiVersion();
-        case "basicpropertybinding":
-        case "basicPropertyBinding": return target.isBasicPropertyBinding();
         case "bridgeerrorhandler":
         case "bridgeErrorHandler": return target.isBridgeErrorHandler();
         case "ceoverride":
@@ -116,5 +117,17 @@ public class KnativeEndpointConfigurer extends PropertyConfigurerSupport impleme
         default: return null;
         }
     }
+
+    @Override
+    public Object getCollectionValueType(Object target, String name, boolean ignoreCase) {
+        switch (ignoreCase ? name.toLowerCase() : name) {
+        case "ceoverride":
+        case "ceOverride": return java.lang.String.class;
+        case "filters": return java.lang.String.class;
+        case "transportoptions":
+        case "transportOptions": return java.lang.Object.class;
+        default: return null;
+        }
+    }
 }
 
diff --git a/components/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json b/components/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json
index 3dd09cb..d7753a9 100644
--- a/components/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json
+++ b/components/camel-knative/camel-knative/src/generated/resources/org/apache/camel/component/knative/knative.json
@@ -22,45 +22,44 @@
     "lenientProperties": false
   },
   "componentProperties": {
-    "ceOverride": { "kind": "property", "displayName": "Ce Override", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "ce.override.", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "CloudEvent headers to override" },
-    "cloudEventsSpecVersion": { "kind": "property", "displayName": "Cloud Events Spec Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "0.1", "0.2", "0.3", "1.0" ], "deprecated": false, "secret": false, "defaultValue": "1.0", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the version of the cloudevents spec." },
-    "cloudEventsType": { "kind": "property", "displayName": "Cloud Events Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "org.apache.camel.event", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the event-type information of the produced events." },
-    "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.KnativeConfiguration", "deprecated": false, "secret": false, "description": "Set the configuration." },
-    "consumerFactory": { "kind": "property", "displayName": "Consumer Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.KnativeConsumerFactory", "deprecated": false, "secret": false, "description": "The protocol consumer factory." },
-    "environment": { "kind": "property", "displayName": "Environment", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.KnativeEnvironment", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The environment" },
-    "environmentPath": { "kind": "property", "displayName": "Environment Path", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The path ot the environment definition" },
-    "filters": { "kind": "property", "displayName": "Filters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "filter.", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the filters." },
-    "producerFactory": { "kind": "property", "displayName": "Producer Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.KnativeProducerFactory", "deprecated": false, "secret": false, "description": "The protocol producer factory." },
-    "transportOptions": { "kind": "property", "displayName": "Transport Options", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "transport.", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the transport options." },
-    "typeId": { "kind": "property", "displayName": "Type Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The name of the service to lookup from the KnativeEnvironment." },
-    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled by [...]
-    "replyWithCloudEvent": { "kind": "property", "displayName": "Reply With Cloud Event", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Transforms the reply into a cloud event that will be processed by the caller. When listening to events [...]
-    "reply": { "kind": "property", "displayName": "Reply", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "If the consumer should construct a full reply to knative request." },
-    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the r [...]
-    "apiVersion": { "kind": "property", "displayName": "Api Version", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The version of the k8s resource referenced by the endpoint." },
-    "basicPropertyBinding": { "kind": "property", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": true, "secret": false, "defaultValue": false, "description": "Whether the component should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
-    "kind": { "kind": "property", "displayName": "Kind", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The type of the k8s resource referenced by the endpoint." },
-    "name": { "kind": "property", "displayName": "Name", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The name of the k8s resource referenced by the endpoint." }
+    "ceOverride": { "kind": "property", "displayName": "Ce Override", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "ce.override.", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "CloudEvent headers to override" },
+    "cloudEventsSpecVersion": { "kind": "property", "displayName": "Cloud Events Spec Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "0.1", "0.2", "0.3", "1.0" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1.0", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the version of the cloudevents spec." },
+    "cloudEventsType": { "kind": "property", "displayName": "Cloud Events Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "org.apache.camel.event", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the event-type information of the produced events." },
+    "configuration": { "kind": "property", "displayName": "Configuration", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.KnativeConfiguration", "deprecated": false, "autowired": false, "secret": false, "description": "Set the configuration." },
+    "consumerFactory": { "kind": "property", "displayName": "Consumer Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.KnativeConsumerFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The protocol consumer factory." },
+    "environment": { "kind": "property", "displayName": "Environment", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.KnativeEnvironment", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The environment" },
+    "environmentPath": { "kind": "property", "displayName": "Environment Path", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The path ot the environment definition" },
+    "filters": { "kind": "property", "displayName": "Filters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "filter.", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the filters." },
+    "producerFactory": { "kind": "property", "displayName": "Producer Factory", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.KnativeProducerFactory", "deprecated": false, "autowired": false, "secret": false, "description": "The protocol producer factory." },
+    "transportOptions": { "kind": "property", "displayName": "Transport Options", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "transport.", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the transport options." },
+    "typeId": { "kind": "property", "displayName": "Type Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The name of the service to lookup from the KnativeEnvironment." },
+    "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a me [...]
+    "replyWithCloudEvent": { "kind": "property", "displayName": "Reply With Cloud Event", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Transforms the reply into a cloud event that will be processed by the caller. When [...]
+    "reply": { "kind": "property", "displayName": "Reply", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "If the consumer should construct a full reply to knative request." },
+    "lazyStartProducer": { "kind": "property", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during star [...]
+    "apiVersion": { "kind": "property", "displayName": "Api Version", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The version of the k8s resource referenced by the endpoint." },
+    "autowiredEnabled": { "kind": "property", "displayName": "Autowired Enabled", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether autowiring is enabled. This is used for automatic autowiring options (the option must be marked as autowired) by looking up in the registry to find if there is a single instance of matching type, which t [...]
+    "kind": { "kind": "property", "displayName": "Kind", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The type of the k8s resource referenced by the endpoint." },
+    "name": { "kind": "property", "displayName": "Name", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The name of the k8s resource referenced by the endpoint." }
   },
   "properties": {
-    "type": { "kind": "path", "displayName": "Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.Knative.Type", "enum": [ "endpoint", "channel", "event" ], "deprecated": false, "secret": false, "description": "The Knative resource type" },
-    "typeId": { "kind": "path", "displayName": "Type Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "description": "The identifier of the Knative resource" },
-    "ceOverride": { "kind": "parameter", "displayName": "Ce Override", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "ce.override.", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "CloudEvent headers to override" },
-    "cloudEventsSpecVersion": { "kind": "parameter", "displayName": "Cloud Events Spec Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "0.1", "0.2", "0.3", "1.0" ], "deprecated": false, "secret": false, "defaultValue": "1.0", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the version of the cloudevents spec." },
-    "cloudEventsType": { "kind": "parameter", "displayName": "Cloud Events Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "defaultValue": "org.apache.camel.event", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the event-type information of the produced events." },
-    "environment": { "kind": "parameter", "displayName": "Environment", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.KnativeEnvironment", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The environment" },
-    "filters": { "kind": "parameter", "displayName": "Filters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "filter.", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the filters." },
-    "transportOptions": { "kind": "parameter", "displayName": "Transport Options", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "transport.", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the transport options." },
-    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a message and handled b [...]
-    "replyWithCloudEvent": { "kind": "parameter", "displayName": "Reply With Cloud Event", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Transforms the reply into a cloud event that will be processed by the caller. When listening to event [...]
-    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the consumer will deal with [...]
-    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
-    "reply": { "kind": "parameter", "displayName": "Reply", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "If the consumer should construct a full reply to knative request." },
-    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during starting and cause the  [...]
-    "apiVersion": { "kind": "parameter", "displayName": "Api Version", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The version of the k8s resource referenced by the endpoint." },
-    "basicPropertyBinding": { "kind": "parameter", "displayName": "Basic Property Binding", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Whether the endpoint should use basic property binding (Camel 2.x) or the newer property binding with additional capabilities" },
-    "kind": { "kind": "parameter", "displayName": "Kind", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The type of the k8s resource referenced by the endpoint." },
-    "name": { "kind": "parameter", "displayName": "Name", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The name of the k8s resource referenced by the endpoint." },
-    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }
+    "type": { "kind": "path", "displayName": "Type", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.Knative.Type", "enum": [ "endpoint", "channel", "event" ], "deprecated": false, "autowired": false, "secret": false, "description": "The Knative resource type" },
+    "typeId": { "kind": "path", "displayName": "Type Id", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The identifier of the Knative resource" },
+    "ceOverride": { "kind": "parameter", "displayName": "Ce Override", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "ce.override.", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "CloudEvent headers to override" },
+    "cloudEventsSpecVersion": { "kind": "parameter", "displayName": "Cloud Events Spec Version", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "enum": [ "0.1", "0.2", "0.3", "1.0" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1.0", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the version of the cloudevents spec." },
+    "cloudEventsType": { "kind": "parameter", "displayName": "Cloud Events Type", "group": "common", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "org.apache.camel.event", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the event-type information of the produced events." },
+    "environment": { "kind": "parameter", "displayName": "Environment", "group": "common", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.knative.spi.KnativeEnvironment", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The environment" },
+    "filters": { "kind": "parameter", "displayName": "Filters", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.String>", "prefix": "filter.", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the filters." },
+    "transportOptions": { "kind": "parameter", "displayName": "Transport Options", "group": "common", "label": "", "required": false, "type": "object", "javaType": "java.util.Map<java.lang.String, java.lang.Object>", "prefix": "transport.", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Set the transport options." },
+    "bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error Handler", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Allows for bridging the consumer to the Camel routing Error Handler, which mean any exceptions occurred while the consumer is trying to pickup incoming messages, or the likes, will now be processed as a m [...]
+    "replyWithCloudEvent": { "kind": "parameter", "displayName": "Reply With Cloud Event", "group": "consumer", "label": "consumer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "Transforms the reply into a cloud event that will be processed by the caller. Whe [...]
+    "exceptionHandler": { "kind": "parameter", "displayName": "Exception Handler", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.", "deprecated": false, "autowired": false, "secret": false, "description": "To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this option is not in use. By default the con [...]
+    "exchangePattern": { "kind": "parameter", "displayName": "Exchange Pattern", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "object", "javaType": "org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut", "InOptionalOut" ], "deprecated": false, "autowired": false, "secret": false, "description": "Sets the exchange pattern when the consumer creates an exchange." },
+    "reply": { "kind": "parameter", "displayName": "Reply", "group": "consumer (advanced)", "label": "consumer,advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "true", "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "If the consumer should construct a full reply to knative request." },
+    "lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer", "label": "producer", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the producer should be started lazy (on the first message). By starting lazy you can use this to allow CamelContext and routes to startup in situations where a producer may otherwise fail during sta [...]
+    "apiVersion": { "kind": "parameter", "displayName": "Api Version", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The version of the k8s resource referenced by the endpoint." },
+    "kind": { "kind": "parameter", "displayName": "Kind", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The type of the k8s resource referenced by the endpoint." },
+    "name": { "kind": "parameter", "displayName": "Name", "group": "advanced", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.knative.KnativeConfiguration", "configurationField": "configuration", "description": "The name of the k8s resource referenced by the endpoint." },
+    "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." }
   }
 }
diff --git a/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java
index 6583ed1..91e20a7 100644
--- a/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java
+++ b/components/camel-knative/camel-knative/src/main/java/org/apache/camel/component/knative/KnativeComponent.java
@@ -29,6 +29,7 @@ import org.apache.camel.component.knative.spi.KnativeEnvironment;
 import org.apache.camel.component.knative.spi.KnativeProducerFactory;
 import org.apache.camel.spi.Metadata;
 import org.apache.camel.spi.annotations.Component;
+import org.apache.camel.support.CamelContextHelper;
 import org.apache.camel.support.DefaultComponent;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
@@ -213,12 +214,6 @@ public class KnativeComponent extends DefaultComponent {
         }
     }
 
-    // ************************
-    //
-    //
-    //
-    // ************************
-
     @SuppressWarnings("unchecked")
     @Override
     protected Endpoint createEndpoint(String uri, String remaining, Map<String, Object> parameters) throws Exception {
@@ -253,7 +248,8 @@ public class KnativeComponent extends DefaultComponent {
     // ************************
 
     private KnativeConfiguration getKnativeConfiguration() throws Exception {
-        KnativeConfiguration conf = configuration.copy();
+        final String envConfig = System.getenv(KnativeConstants.CONFIGURATION_ENV_VARIABLE);
+        final KnativeConfiguration conf = configuration.copy();
 
         if (conf.getTransportOptions() == null) {
             conf.setTransportOptions(new HashMap<>());
@@ -266,24 +262,23 @@ public class KnativeComponent extends DefaultComponent {
         }
 
         if (conf.getEnvironment() == null) {
-            String envConfig = System.getenv(KnativeConstants.CONFIGURATION_ENV_VARIABLE);
+            KnativeEnvironment env;
+
             if (environmentPath != null) {
-                conf.setEnvironment(
-                    KnativeEnvironment.mandatoryLoadFromResource(getCamelContext(), this.environmentPath)
-                );
+                env = KnativeEnvironment.mandatoryLoadFromResource(getCamelContext(), this.environmentPath);
             } else if (envConfig != null) {
-                if (envConfig.startsWith("file:") || envConfig.startsWith("classpath:")) {
-                    conf.setEnvironment(
-                        KnativeEnvironment.mandatoryLoadFromResource(getCamelContext(), envConfig)
-                    );
-                } else {
-                    conf.setEnvironment(
-                        KnativeEnvironment.mandatoryLoadFromSerializedString(envConfig)
-                    );
-                }
+                env = envConfig.startsWith("file:") || envConfig.startsWith("classpath:")
+                    ? KnativeEnvironment.mandatoryLoadFromResource(getCamelContext(), envConfig)
+                    : KnativeEnvironment.mandatoryLoadFromSerializedString(envConfig);
             } else {
+                env = CamelContextHelper.findByType(getCamelContext(), KnativeEnvironment.class);
+            }
+
+            if (env == null) {
                 throw new IllegalStateException("Cannot load Knative configuration from file or env variable");
             }
+
+            conf.setEnvironment(env);
         }
 
         return conf;
@@ -291,7 +286,7 @@ public class KnativeComponent extends DefaultComponent {
 
     private void setUpProducerFactory() throws Exception {
         if (producerFactory == null) {
-            this.producerFactory = getCamelContext().getRegistry().lookupByNameAndType(protocol.name(), KnativeProducerFactory.class);
+            this.producerFactory = CamelContextHelper.lookup(getCamelContext(), protocol.name(), KnativeProducerFactory.class);
 
             if (this.producerFactory == null) {
                 this.producerFactory = getCamelContext()
@@ -319,7 +314,7 @@ public class KnativeComponent extends DefaultComponent {
 
     private void setUpConsumerFactory() throws Exception {
         if (consumerFactory == null) {
-            this.consumerFactory = getCamelContext().getRegistry().lookupByNameAndType(protocol.name(), KnativeConsumerFactory.class);
+            this.consumerFactory = CamelContextHelper.lookup(getCamelContext(), protocol.name(), KnativeConsumerFactory.class);
 
             if (this.consumerFactory == null) {
                 this.consumerFactory = getCamelContext()
@@ -328,7 +323,7 @@ public class KnativeComponent extends DefaultComponent {
                     .newInstance(protocol.name() + "-consumer", KnativeConsumerFactory.class)
                     .orElse(null);
 
-                if (this.producerFactory == null) {
+                if (this.consumerFactory == null) {
                     return;
                 }
                 if (configuration.getTransportOptions() != null) {
diff --git a/pom.xml b/pom.xml
index ccea225..91bdcbd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dependencies</artifactId>
-        <version>3.6.0</version>
+        <version>3.7.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -38,12 +38,12 @@
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
 
-        <camel-version>3.6.0</camel-version>
+        <camel-version>3.7.0-SNAPSHOT</camel-version>
 
         <!-- quarkus -->
-        <camel-quarkus-version>1.4.0</camel-quarkus-version>
+        <camel-quarkus-version>1.5.0-SNAPSHOT</camel-quarkus-version>
         <graalvm-version>20.2.0</graalvm-version>
-        <quarkus-version>1.10.0.Final</quarkus-version>
+        <quarkus-version>1.10.2.Final</quarkus-version>
 
         <!-- camel-k -->
         <joor-version>0.9.13</joor-version>