You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2022/02/28 13:50:43 UTC

[camel] 01/02: CAMEL-17701: camel-core-model - Add labels to EIP options

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

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

commit e2370ae49d31617c91efa4a522990ce715bdb5b2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Feb 28 14:15:33 2022 +0100

    CAMEL-17701: camel-core-model - Add labels to EIP options
---
 .../apache/camel/catalog/models/batch-config.json  |  6 +-
 .../org/apache/camel/catalog/models/constant.json  |  2 +-
 .../org/apache/camel/catalog/models/csimple.json   |  2 +-
 .../apache/camel/catalog/models/datasonnet.json    |  2 +-
 .../camel/catalog/models/exchangeProperty.json     |  2 +-
 .../apache/camel/catalog/models/expression.json    |  2 +-
 .../org/apache/camel/catalog/models/groovy.json    |  2 +-
 .../org/apache/camel/catalog/models/header.json    |  2 +-
 .../org/apache/camel/catalog/models/hl7terser.json |  2 +-
 .../org/apache/camel/catalog/models/joor.json      |  6 +-
 .../org/apache/camel/catalog/models/jsonpath.json  | 10 +--
 .../org/apache/camel/catalog/models/language.json  |  2 +-
 .../org/apache/camel/catalog/models/method.json    |  4 +-
 .../org/apache/camel/catalog/models/mvel.json      |  2 +-
 .../org/apache/camel/catalog/models/ognl.json      |  2 +-
 .../org/apache/camel/catalog/models/ref.json       |  2 +-
 .../org/apache/camel/catalog/models/simple.json    |  2 +-
 .../org/apache/camel/catalog/models/spel.json      |  2 +-
 .../apache/camel/catalog/models/stream-config.json |  6 +-
 .../org/apache/camel/catalog/models/tokenize.json  | 14 ++--
 .../org/apache/camel/catalog/models/weighted.json  |  4 +-
 .../org/apache/camel/catalog/models/xpath.json     | 10 +--
 .../org/apache/camel/catalog/models/xquery.json    |  4 +-
 .../org/apache/camel/catalog/models/xtokenize.json |  8 +--
 .../apache/camel/catalog/schemas/camel-spring.xsd  | 14 ++--
 .../apache/camel/model/config/batch-config.json    |  6 +-
 .../apache/camel/model/config/stream-config.json   |  6 +-
 .../org/apache/camel/model/language/constant.json  |  2 +-
 .../org/apache/camel/model/language/csimple.json   |  2 +-
 .../apache/camel/model/language/datasonnet.json    |  2 +-
 .../camel/model/language/exchangeProperty.json     |  2 +-
 .../apache/camel/model/language/expression.json    |  2 +-
 .../org/apache/camel/model/language/groovy.json    |  2 +-
 .../org/apache/camel/model/language/header.json    |  2 +-
 .../org/apache/camel/model/language/hl7terser.json |  2 +-
 .../org/apache/camel/model/language/joor.json      |  6 +-
 .../org/apache/camel/model/language/jsonpath.json  | 10 +--
 .../org/apache/camel/model/language/language.json  |  2 +-
 .../org/apache/camel/model/language/method.json    |  4 +-
 .../org/apache/camel/model/language/mvel.json      |  2 +-
 .../org/apache/camel/model/language/ognl.json      |  2 +-
 .../org/apache/camel/model/language/ref.json       |  2 +-
 .../org/apache/camel/model/language/simple.json    |  2 +-
 .../org/apache/camel/model/language/spel.json      |  2 +-
 .../org/apache/camel/model/language/tokenize.json  | 14 ++--
 .../org/apache/camel/model/language/xpath.json     | 10 +--
 .../org/apache/camel/model/language/xquery.json    |  4 +-
 .../org/apache/camel/model/language/xtokenize.json |  8 +--
 .../apache/camel/model/loadbalancer/weighted.json  |  4 +-
 .../camel/model/config/BatchResequencerConfig.java |  7 +-
 .../model/config/StreamResequencerConfig.java      |  6 +-
 .../camel/model/language/DatasonnetExpression.java |  3 -
 .../camel/model/language/ExpressionDefinition.java | 16 +++--
 .../camel/model/language/JoorExpression.java       |  8 +--
 .../camel/model/language/JsonPathExpression.java   |  8 ++-
 .../camel/model/language/LanguageExpression.java   |  1 +
 .../camel/model/language/MethodCallExpression.java | 12 ++--
 .../model/language/NamespaceAwareExpression.java   |  1 +
 .../camel/model/language/SimpleExpression.java     |  1 +
 .../camel/model/language/TokenizerExpression.java  |  9 ++-
 .../model/language/XMLTokenizerExpression.java     |  6 +-
 .../camel/model/language/XPathExpression.java      | 19 ++---
 .../camel/model/language/XQueryExpression.java     | 11 +--
 .../loadbalancer/CustomLoadBalancerDefinition.java |  1 +
 .../FailoverLoadBalancerDefinition.java            |  1 +
 .../loadbalancer/StickyLoadBalancerDefinition.java |  1 +
 .../WeightedLoadBalancerDefinition.java            |  4 +-
 .../transformer/CustomTransformerDefinition.java   |  4 --
 .../DataFormatTransformerDefinition.java           | 82 +++++++++++-----------
 .../transformer/EndpointTransformerDefinition.java |  4 --
 .../model/transformer/TransformersDefinition.java  |  6 +-
 .../model/validator/CustomValidatorDefinition.java |  4 --
 .../validator/EndpointValidatorDefinition.java     |  4 --
 .../camel/model/validator/ValidatorDefinition.java |  4 --
 .../model/validator/ValidatorsDefinition.java      |  6 +-
 .../dsl/yaml/deserializers/ModelDeserializers.java |  2 +-
 .../src/generated/resources/camel-yaml-dsl.json    |  2 +-
 .../src/generated/resources/camelYamlDsl.json      |  2 +-
 .../apache/camel/dsl/yaml/LoadBalanceTest.groovy   |  2 +-
 79 files changed, 227 insertions(+), 224 deletions(-)

diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/batch-config.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/batch-config.json
index 9600271..bc0cf24 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/batch-config.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/batch-config.json
@@ -14,8 +14,8 @@
   "properties": {
     "batchSize": { "kind": "attribute", "displayName": "Batch Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "description": "Sets the size of the batch to be re-ordered. The default size is 100." },
     "batchTimeout": { "kind": "attribute", "displayName": "Batch Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets the timeout for collecting elements to be re-ordered. The default timeout is 1000 msec." },
-    "allowDuplicates": { "kind": "attribute", "displayName": "Allow Duplicates", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow duplicates." },
-    "reverse": { "kind": "attribute", "displayName": "Reverse", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to reverse the ordering." },
-    "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" }
+    "allowDuplicates": { "kind": "attribute", "displayName": "Allow Duplicates", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow duplicates." },
+    "reverse": { "kind": "attribute", "displayName": "Reverse", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to reverse the ordering." },
+    "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/constant.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/constant.json
index 1ac6578..a278b36 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/constant.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/constant.json
@@ -15,7 +15,7 @@
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the constant type" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csimple.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csimple.json
index ca154f8..7fddf1b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csimple.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/csimple.json
@@ -15,7 +15,7 @@
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/datasonnet.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/datasonnet.json
index bf0d209..adfe20a 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/datasonnet.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/datasonnet.json
@@ -17,7 +17,7 @@
     "bodyMediaType": { "kind": "attribute", "displayName": "Body Media Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The String representation of the message's body MediaType" },
     "outputMediaType": { "kind": "attribute", "displayName": "Output Media Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The String representation of the MediaType to output" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output) The default result type is com.datasonnet.document.Document" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/exchangeProperty.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/exchangeProperty.json
index 10635f8..7be2d69 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/exchangeProperty.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/exchangeProperty.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/expression.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/expression.json
index d0fc29f..1cd1955 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/expression.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/expression.json
@@ -13,7 +13,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/groovy.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/groovy.json
index 6d25319..77c92e9 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/groovy.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/groovy.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/header.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/header.json
index 0d4dafe..89543ac 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/header.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/header.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/hl7terser.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/hl7terser.json
index 92cd098..7369115 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/hl7terser.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/hl7terser.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/joor.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/joor.json
index 3de1fe9..4c710ce 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/joor.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/joor.json
@@ -14,10 +14,10 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "preCompile": { "kind": "attribute", "displayName": "Pre Compile", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the expression should be pre compiled once during initialization phase. If this is turned off, then the expression is reloaded and compiled on each evaluation." },
+    "preCompile": { "kind": "attribute", "displayName": "Pre Compile", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the expression should be pre compiled once during initialization phase. If this is turned off, then the expression is reloaded and compiled on each evaluation." },
+    "singleQuotes": { "kind": "attribute", "displayName": "Single Quotes", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether single quotes can be used as replacement for double quotes. This is convenient when you need to work with strings inside strings." },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" },
-    "singleQuotes": { "kind": "attribute", "displayName": "Single Quotes", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether single quotes can be used as replacement for double quotes. This is convenient when you need to work with strings inside strings." },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonpath.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonpath.json
index bc67275..108923f 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonpath.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/jsonpath.json
@@ -16,12 +16,12 @@
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" },
     "suppressExceptions": { "kind": "attribute", "displayName": "Suppress Exceptions", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to suppress exceptions such as PathNotFoundException." },
-    "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined Simple exceptions in the JSONPath expression" },
-    "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." },
+    "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined Simple exceptions in the JSONPath expression" },
+    "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." },
     "writeAsString": { "kind": "attribute", "displayName": "Write As String", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to write the output of each row\/element as a JSON String value instead of a Map\/POJO value." },
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
-    "option": { "kind": "attribute", "displayName": "Option", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on JSONPath. Multiple values can be separated by comma." },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
+    "option": { "kind": "attribute", "displayName": "Option", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on JSONPath. Multiple values can be separated by comma." },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/language.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/language.json
index 9817eb0..7d623d5 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/language.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/language.json
@@ -14,7 +14,7 @@
   "properties": {
     "language": { "kind": "attribute", "displayName": "Language", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of the language to use" },
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/method.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/method.json
index 1d0018f..0596578 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/method.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/method.json
@@ -16,8 +16,8 @@
     "ref": { "kind": "attribute", "displayName": "Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Reference to an existing bean (bean id) to lookup in the registry" },
     "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of method to call" },
     "beanType": { "kind": "attribute", "displayName": "Bean Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class name (fully qualified) of the bean to use Will lookup in registry and if there is a single instance of the same type, then the existing bean is used, otherwise a new bean is created (requires a default no-arg constructor)." },
-    "scope": { "kind": "attribute", "displayName": "Scope", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "Singleton", "Request", "Prototype" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case concurrent threads is calling the  [...]
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "scope": { "kind": "attribute", "displayName": "Scope", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "Singleton", "Request", "Prototype" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case concurrent th [...]
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/mvel.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/mvel.json
index ae44fc1..88afff8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/mvel.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/mvel.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ognl.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ognl.json
index f5ae745..f5af40b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ognl.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ognl.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ref.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ref.json
index 20f88b7..f2cf694 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ref.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/ref.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/simple.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/simple.json
index e889a9c..16b3220 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/simple.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/simple.json
@@ -15,7 +15,7 @@
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/spel.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/spel.json
index 54ff461..ec1362c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/spel.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/spel.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stream-config.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stream-config.json
index ab37785..0af73bb 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stream-config.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/stream-config.json
@@ -14,9 +14,9 @@
   "properties": {
     "capacity": { "kind": "attribute", "displayName": "Capacity", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets the capacity of the resequencer inbound queue." },
     "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets minimum time (milliseconds) to wait for missing elements (messages)." },
-    "deliveryAttemptInterval": { "kind": "attribute", "displayName": "Delivery Attempt Interval", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets the interval in milliseconds the stream resequencer will at most wait while waiting for condition of being able to deliver." },
-    "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" },
-    "rejectOld": { "kind": "attribute", "displayName": "Reject Old", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If true, throws an exception when messages older than the last delivered message are processed" },
+    "deliveryAttemptInterval": { "kind": "attribute", "displayName": "Delivery Attempt Interval", "label": "advanced", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets the interval in milliseconds the stream resequencer will at most wait while waiting for condition of being able to deliver." },
+    "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" },
+    "rejectOld": { "kind": "attribute", "displayName": "Reject Old", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If true, throws an exception when messages older than the last delivered message are processed" },
     "comparator": { "kind": "attribute", "displayName": "Comparator", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.processor.resequencer.ExpressionResultComparator", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom comparator as a org.apache.camel.processor.resequencer.ExpressionResultComparator type." }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
index 4753596..8a3af1b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/tokenize.json
@@ -15,15 +15,15 @@
   "properties": {
     "token": { "kind": "attribute", "displayName": "Token", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The (start) token to use as tokenizer, for example you can use the new line token. You can use simple language as the token to support dynamic tokens." },
     "endToken": { "kind": "attribute", "displayName": "End Token", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The end token to use as tokenizer if using start\/end token pairs. You can use simple language as the token to support dynamic tokens." },
-    "inheritNamespaceTagName": { "kind": "attribute", "displayName": "Inherit Namespace Tag Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To inherit namespaces from a root\/parent tag name when using XML You can use simple language as the tag name to support dynamic names." },
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." },
-    "regex": { "kind": "attribute", "displayName": "Regex", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the token is a regular expression pattern. The default value is false" },
+    "inheritNamespaceTagName": { "kind": "attribute", "displayName": "Inherit Namespace Tag Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To inherit namespaces from a root\/parent tag name when using XML You can use simple language as the tag name to support dynamic names." },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." },
+    "regex": { "kind": "attribute", "displayName": "Regex", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the token is a regular expression pattern. The default value is false" },
     "xml": { "kind": "attribute", "displayName": "Xml", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the input is XML messages. This option must be set to true if working with XML payloads." },
     "includeTokens": { "kind": "attribute", "displayName": "Include Tokens", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to include the tokens in the parts when using pairs The default value is false" },
-    "group": { "kind": "attribute", "displayName": "Group", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together, for example to split big files into chunks of 1000 lines. You can use simple language as the group to support dynamic group sizes." },
-    "groupDelimiter": { "kind": "attribute", "displayName": "Group Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the delimiter to use when grouping. If this has not been set then token will be used as the delimiter." },
-    "skipFirst": { "kind": "attribute", "displayName": "Skip First", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To skip the very first element" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "group": { "kind": "attribute", "displayName": "Group", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together, for example to split big files into chunks of 1000 lines. You can use simple language as the group to support dynamic group sizes." },
+    "groupDelimiter": { "kind": "attribute", "displayName": "Group Delimiter", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the delimiter to use when grouping. If this has not been set then token will be used as the delimiter." },
+    "skipFirst": { "kind": "attribute", "displayName": "Skip First", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To skip the very first element" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weighted.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weighted.json
index 98e53de..199af35 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weighted.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/weighted.json
@@ -13,8 +13,8 @@
   },
   "properties": {
     "distributionRatio": { "kind": "attribute", "displayName": "Distribution Ratio", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The distribution ratio is a delimited String consisting on integer weights separated by delimiters for example 2,3,5. The distributionRatio must match the number of endpoints and\/or processors specified in the load balancer list." },
-    "distributionRatioDelimiter": { "kind": "attribute", "displayName": "Distribution Ratio Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": ",", "description": "Delimiter used to specify the distribution ratio. The default value is , (comma)" },
-    "roundRobin": { "kind": "attribute", "displayName": "Round Robin", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To enable round robin mode. By default the weighted distribution mode is used. The default value is false." },
+    "distributionRatioDelimiter": { "kind": "attribute", "displayName": "Distribution Ratio Delimiter", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": ",", "description": "Delimiter used to specify the distribution ratio. The default value is , (comma)" },
+    "roundRobin": { "kind": "attribute", "displayName": "Round Robin", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable round robin mode. By default the weighted distribution mode is used. The default value is false." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xpath.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xpath.json
index 4ec36cc..26ea16c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xpath.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xpath.json
@@ -14,16 +14,16 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "documentType": { "kind": "attribute", "displayName": "Document Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class for document type The default value is org.w3c.dom.Document" },
+    "documentType": { "kind": "attribute", "displayName": "Document Type", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class for document type The default value is org.w3c.dom.Document" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "NUMBER", "STRING", "BOOLEAN", "NODESET", "NODE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "NODESET", "description": "Sets the class name of the result type (type from output) The default result type is NodeSet" },
-    "saxon": { "kind": "attribute", "displayName": "Saxon", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to use Saxon." },
+    "saxon": { "kind": "attribute", "displayName": "Saxon", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to use Saxon." },
     "factoryRef": { "kind": "attribute", "displayName": "Factory Ref", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom XPathFactory to lookup in the registry" },
     "objectModel": { "kind": "attribute", "displayName": "Object Model", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The XPath object model to use" },
-    "logNamespaces": { "kind": "attribute", "displayName": "Log Namespaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to log namespaces which can assist during troubleshooting" },
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
+    "logNamespaces": { "kind": "attribute", "displayName": "Log Namespaces", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to log namespaces which can assist during troubleshooting" },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
     "threadSafety": { "kind": "attribute", "displayName": "Thread Safety", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable thread-safety for the returned result of the xpath expression. This applies to when using NODESET as the result type, and the returned set has multiple elements. In this situation there can be thread-safety iss [...]
     "preCompile": { "kind": "attribute", "displayName": "Pre Compile", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to enable pre-compiling the xpath expression during initialization phase. pre-compile is enabled by default. This can be used to turn off, for example in cases the compilation phase is desired at the starting phase, such as i [...]
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xquery.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xquery.json
index 7fb13d3..dee4fd8 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xquery.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xquery.json
@@ -15,9 +15,9 @@
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output) The default result type is NodeSet" },
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
     "configurationRef": { "kind": "attribute", "displayName": "Configuration Ref", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Reference to a saxon configuration instance in the registry to use for xquery (requires camel-saxon). This may be needed to add custom functions to a saxon configuration, so these custom functions can be used in xquery expressions." },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xtokenize.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xtokenize.json
index cddbc04..90c9f7b 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xtokenize.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/xtokenize.json
@@ -13,10 +13,10 @@
     "output": false
   },
   "properties": {
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." },
-    "mode": { "kind": "attribute", "displayName": "Mode", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "i", "w", "u", "t" ], "deprecated": false, "autowired": false, "secret": false, "description": "The extraction mode. The available extraction modes are: i - injecting the contextual namespace bindings into the extracted token (default) w - wrapping the extracted token in its ancestor context u - unwrapping the extracted token to its child content t - extr [...]
-    "group": { "kind": "attribute", "displayName": "Group", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." },
+    "mode": { "kind": "attribute", "displayName": "Mode", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "i", "w", "u", "t" ], "deprecated": false, "autowired": false, "secret": false, "description": "The extraction mode. The available extraction modes are: i - injecting the contextual namespace bindings into the extracted token (default) w - wrapping the extracted token in its ancestor context u - unwrapping the extracted token to its c [...]
+    "group": { "kind": "attribute", "displayName": "Group", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 8a46dca..96acc62 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -5722,7 +5722,7 @@ Delimiter used to specify the distribution ratio. The default value is ,
           <xs:annotation>
             <xs:documentation xml:lang="en"><![CDATA[
 To enable round robin mode. By default the weighted distribution mode is used.
-The default value is false.
+The default value is false. Default value: false
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
@@ -13315,19 +13315,19 @@ evaluation. Default value: true
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="resultType" type="xs:string">
+        <xs:attribute name="singleQuotes" type="xs:string">
           <xs:annotation>
             <xs:documentation xml:lang="en"><![CDATA[
-Sets the class name of the result type (type from output).
+Whether single quotes can be used as replacement for double quotes. This is
+convenient when you need to work with strings inside strings. Default value:
+true
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
-        <xs:attribute name="singleQuotes" type="xs:string">
+        <xs:attribute name="resultType" type="xs:string">
           <xs:annotation>
             <xs:documentation xml:lang="en"><![CDATA[
-Whether single quotes can be used as replacement for double quotes. This is
-convenient when you need to work with strings inside strings. Default value:
-true
+Sets the class name of the result type (type from output).
             ]]></xs:documentation>
           </xs:annotation>
         </xs:attribute>
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json
index 9600271..bc0cf24 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/batch-config.json
@@ -14,8 +14,8 @@
   "properties": {
     "batchSize": { "kind": "attribute", "displayName": "Batch Size", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "100", "description": "Sets the size of the batch to be re-ordered. The default size is 100." },
     "batchTimeout": { "kind": "attribute", "displayName": "Batch Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets the timeout for collecting elements to be re-ordered. The default timeout is 1000 msec." },
-    "allowDuplicates": { "kind": "attribute", "displayName": "Allow Duplicates", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow duplicates." },
-    "reverse": { "kind": "attribute", "displayName": "Reverse", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to reverse the ordering." },
-    "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" }
+    "allowDuplicates": { "kind": "attribute", "displayName": "Allow Duplicates", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to allow duplicates." },
+    "reverse": { "kind": "attribute", "displayName": "Reverse", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to reverse the ordering." },
+    "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json
index ab37785..0af73bb 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/config/stream-config.json
@@ -14,9 +14,9 @@
   "properties": {
     "capacity": { "kind": "attribute", "displayName": "Capacity", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets the capacity of the resequencer inbound queue." },
     "timeout": { "kind": "attribute", "displayName": "Timeout", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets minimum time (milliseconds) to wait for missing elements (messages)." },
-    "deliveryAttemptInterval": { "kind": "attribute", "displayName": "Delivery Attempt Interval", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets the interval in milliseconds the stream resequencer will at most wait while waiting for condition of being able to deliver." },
-    "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" },
-    "rejectOld": { "kind": "attribute", "displayName": "Reject Old", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If true, throws an exception when messages older than the last delivered message are processed" },
+    "deliveryAttemptInterval": { "kind": "attribute", "displayName": "Delivery Attempt Interval", "label": "advanced", "required": false, "type": "duration", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "1000", "description": "Sets the interval in milliseconds the stream resequencer will at most wait while waiting for condition of being able to deliver." },
+    "ignoreInvalidExchanges": { "kind": "attribute", "displayName": "Ignore Invalid Exchanges", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to ignore invalid exchanges" },
+    "rejectOld": { "kind": "attribute", "displayName": "Reject Old", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If true, throws an exception when messages older than the last delivered message are processed" },
     "comparator": { "kind": "attribute", "displayName": "Comparator", "label": "advanced", "required": false, "type": "object", "javaType": "org.apache.camel.processor.resequencer.ExpressionResultComparator", "deprecated": false, "autowired": false, "secret": false, "description": "To use a custom comparator as a org.apache.camel.processor.resequencer.ExpressionResultComparator type." }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/constant.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/constant.json
index 1ac6578..a278b36 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/constant.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/constant.json
@@ -15,7 +15,7 @@
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the constant type" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/csimple.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/csimple.json
index ca154f8..7fddf1b 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/csimple.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/csimple.json
@@ -15,7 +15,7 @@
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/datasonnet.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/datasonnet.json
index bf0d209..adfe20a 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/datasonnet.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/datasonnet.json
@@ -17,7 +17,7 @@
     "bodyMediaType": { "kind": "attribute", "displayName": "Body Media Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The String representation of the message's body MediaType" },
     "outputMediaType": { "kind": "attribute", "displayName": "Output Media Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The String representation of the MediaType to output" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output) The default result type is com.datasonnet.document.Document" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json
index 10635f8..7be2d69 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/exchangeProperty.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/expression.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/expression.json
index d0fc29f..1cd1955 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/expression.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/expression.json
@@ -13,7 +13,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/groovy.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/groovy.json
index 6d25319..77c92e9 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/groovy.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/groovy.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/header.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/header.json
index 0d4dafe..89543ac 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/header.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/header.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/hl7terser.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/hl7terser.json
index 92cd098..7369115 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/hl7terser.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/hl7terser.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/joor.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/joor.json
index 3de1fe9..4c710ce 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/joor.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/joor.json
@@ -14,10 +14,10 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "preCompile": { "kind": "attribute", "displayName": "Pre Compile", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the expression should be pre compiled once during initialization phase. If this is turned off, then the expression is reloaded and compiled on each evaluation." },
+    "preCompile": { "kind": "attribute", "displayName": "Pre Compile", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether the expression should be pre compiled once during initialization phase. If this is turned off, then the expression is reloaded and compiled on each evaluation." },
+    "singleQuotes": { "kind": "attribute", "displayName": "Single Quotes", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether single quotes can be used as replacement for double quotes. This is convenient when you need to work with strings inside strings." },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" },
-    "singleQuotes": { "kind": "attribute", "displayName": "Single Quotes", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether single quotes can be used as replacement for double quotes. This is convenient when you need to work with strings inside strings." },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json
index bc67275..108923f 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/jsonpath.json
@@ -16,12 +16,12 @@
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" },
     "suppressExceptions": { "kind": "attribute", "displayName": "Suppress Exceptions", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to suppress exceptions such as PathNotFoundException." },
-    "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined Simple exceptions in the JSONPath expression" },
-    "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." },
+    "allowSimple": { "kind": "attribute", "displayName": "Allow Simple", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow in inlined Simple exceptions in the JSONPath expression" },
+    "allowEasyPredicate": { "kind": "attribute", "displayName": "Allow Easy Predicate", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to allow using the easy predicate parser to pre-parse predicates." },
     "writeAsString": { "kind": "attribute", "displayName": "Write As String", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to write the output of each row\/element as a JSON String value instead of a Map\/POJO value." },
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
-    "option": { "kind": "attribute", "displayName": "Option", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on JSONPath. Multiple values can be separated by comma." },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
+    "option": { "kind": "attribute", "displayName": "Option", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "DEFAULT_PATH_LEAF_TO_NULL", "ALWAYS_RETURN_LIST", "AS_PATH_LIST", "SUPPRESS_EXCEPTIONS", "REQUIRE_PROPERTIES" ], "deprecated": false, "autowired": false, "secret": false, "description": "To configure additional options on JSONPath. Multiple values can be separated by comma." },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/language.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/language.json
index 9817eb0..7d623d5 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/language.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/language.json
@@ -14,7 +14,7 @@
   "properties": {
     "language": { "kind": "attribute", "displayName": "Language", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of the language to use" },
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json
index 1d0018f..0596578 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json
@@ -16,8 +16,8 @@
     "ref": { "kind": "attribute", "displayName": "Ref", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Reference to an existing bean (bean id) to lookup in the registry" },
     "method": { "kind": "attribute", "displayName": "Method", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of method to call" },
     "beanType": { "kind": "attribute", "displayName": "Bean Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Class name (fully qualified) of the bean to use Will lookup in registry and if there is a single instance of the same type, then the existing bean is used, otherwise a new bean is created (requires a default no-arg constructor)." },
-    "scope": { "kind": "attribute", "displayName": "Scope", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "Singleton", "Request", "Prototype" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case concurrent threads is calling the  [...]
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "scope": { "kind": "attribute", "displayName": "Scope", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "Singleton", "Request", "Prototype" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "Singleton", "description": "Scope of bean. When using singleton scope (default) the bean is created or looked up only once and reused for the lifetime of the endpoint. The bean should be thread-safe in case concurrent th [...]
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/mvel.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/mvel.json
index ae44fc1..88afff8 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/mvel.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/mvel.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ognl.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ognl.json
index f5ae745..f5af40b 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ognl.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ognl.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ref.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ref.json
index 20f88b7..f2cf694 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ref.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/ref.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/simple.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/simple.json
index e889a9c..16b3220 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/simple.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/simple.json
@@ -15,7 +15,7 @@
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output)" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/spel.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/spel.json
index 54ff461..ec1362c 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/spel.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/spel.json
@@ -14,7 +14,7 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/tokenize.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/tokenize.json
index 4753596..8a3af1b 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/tokenize.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/tokenize.json
@@ -15,15 +15,15 @@
   "properties": {
     "token": { "kind": "attribute", "displayName": "Token", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The (start) token to use as tokenizer, for example you can use the new line token. You can use simple language as the token to support dynamic tokens." },
     "endToken": { "kind": "attribute", "displayName": "End Token", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The end token to use as tokenizer if using start\/end token pairs. You can use simple language as the token to support dynamic tokens." },
-    "inheritNamespaceTagName": { "kind": "attribute", "displayName": "Inherit Namespace Tag Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To inherit namespaces from a root\/parent tag name when using XML You can use simple language as the tag name to support dynamic names." },
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." },
-    "regex": { "kind": "attribute", "displayName": "Regex", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the token is a regular expression pattern. The default value is false" },
+    "inheritNamespaceTagName": { "kind": "attribute", "displayName": "Inherit Namespace Tag Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To inherit namespaces from a root\/parent tag name when using XML You can use simple language as the tag name to support dynamic names." },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." },
+    "regex": { "kind": "attribute", "displayName": "Regex", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "If the token is a regular expression pattern. The default value is false" },
     "xml": { "kind": "attribute", "displayName": "Xml", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the input is XML messages. This option must be set to true if working with XML payloads." },
     "includeTokens": { "kind": "attribute", "displayName": "Include Tokens", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to include the tokens in the parts when using pairs The default value is false" },
-    "group": { "kind": "attribute", "displayName": "Group", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together, for example to split big files into chunks of 1000 lines. You can use simple language as the group to support dynamic group sizes." },
-    "groupDelimiter": { "kind": "attribute", "displayName": "Group Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the delimiter to use when grouping. If this has not been set then token will be used as the delimiter." },
-    "skipFirst": { "kind": "attribute", "displayName": "Skip First", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To skip the very first element" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "group": { "kind": "attribute", "displayName": "Group", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together, for example to split big files into chunks of 1000 lines. You can use simple language as the group to support dynamic group sizes." },
+    "groupDelimiter": { "kind": "attribute", "displayName": "Group Delimiter", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the delimiter to use when grouping. If this has not been set then token will be used as the delimiter." },
+    "skipFirst": { "kind": "attribute", "displayName": "Skip First", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To skip the very first element" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xpath.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xpath.json
index 4ec36cc..26ea16c 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xpath.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xpath.json
@@ -14,16 +14,16 @@
   },
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
-    "documentType": { "kind": "attribute", "displayName": "Document Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class for document type The default value is org.w3c.dom.Document" },
+    "documentType": { "kind": "attribute", "displayName": "Document Type", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of class for document type The default value is org.w3c.dom.Document" },
     "resultType": { "kind": "attribute", "displayName": "Result Type", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "NUMBER", "STRING", "BOOLEAN", "NODESET", "NODE" ], "deprecated": false, "autowired": false, "secret": false, "defaultValue": "NODESET", "description": "Sets the class name of the result type (type from output) The default result type is NodeSet" },
-    "saxon": { "kind": "attribute", "displayName": "Saxon", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to use Saxon." },
+    "saxon": { "kind": "attribute", "displayName": "Saxon", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to use Saxon." },
     "factoryRef": { "kind": "attribute", "displayName": "Factory Ref", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "References to a custom XPathFactory to lookup in the registry" },
     "objectModel": { "kind": "attribute", "displayName": "Object Model", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The XPath object model to use" },
-    "logNamespaces": { "kind": "attribute", "displayName": "Log Namespaces", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to log namespaces which can assist during troubleshooting" },
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
+    "logNamespaces": { "kind": "attribute", "displayName": "Log Namespaces", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to log namespaces which can assist during troubleshooting" },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
     "threadSafety": { "kind": "attribute", "displayName": "Thread Safety", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether to enable thread-safety for the returned result of the xpath expression. This applies to when using NODESET as the result type, and the returned set has multiple elements. In this situation there can be thread-safety iss [...]
     "preCompile": { "kind": "attribute", "displayName": "Pre Compile", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to enable pre-compiling the xpath expression during initialization phase. pre-compile is enabled by default. This can be used to turn off, for example in cases the compilation phase is desired at the starting phase, such as i [...]
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xquery.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xquery.json
index 7fb13d3..dee4fd8 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xquery.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xquery.json
@@ -15,9 +15,9 @@
   "properties": {
     "expression": { "kind": "value", "displayName": "Expression", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The expression value in your chosen language syntax" },
     "type": { "kind": "attribute", "displayName": "Type", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the class name of the result type (type from output) The default result type is NodeSet" },
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to use as input, instead of the message body" },
     "configurationRef": { "kind": "attribute", "displayName": "Configuration Ref", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Reference to a saxon configuration instance in the registry to use for xquery (requires camel-saxon). This may be needed to add custom functions to a saxon configuration, so these custom functions can be used in xquery expressions." },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xtokenize.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xtokenize.json
index cddbc04..90c9f7b 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xtokenize.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/xtokenize.json
@@ -13,10 +13,10 @@
     "output": false
   },
   "properties": {
-    "headerName": { "kind": "attribute", "displayName": "Header Name", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." },
-    "mode": { "kind": "attribute", "displayName": "Mode", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "i", "w", "u", "t" ], "deprecated": false, "autowired": false, "secret": false, "description": "The extraction mode. The available extraction modes are: i - injecting the contextual namespace bindings into the extracted token (default) w - wrapping the extracted token in its ancestor context u - unwrapping the extracted token to its child content t - extr [...]
-    "group": { "kind": "attribute", "displayName": "Group", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together" },
-    "trim": { "kind": "attribute", "displayName": "Trim", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
+    "headerName": { "kind": "attribute", "displayName": "Header Name", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Name of header to tokenize instead of using the message body." },
+    "mode": { "kind": "attribute", "displayName": "Mode", "label": "advanced", "required": false, "type": "enum", "javaType": "java.lang.String", "enum": [ "i", "w", "u", "t" ], "deprecated": false, "autowired": false, "secret": false, "description": "The extraction mode. The available extraction modes are: i - injecting the contextual namespace bindings into the extracted token (default) w - wrapping the extracted token in its ancestor context u - unwrapping the extracted token to its c [...]
+    "group": { "kind": "attribute", "displayName": "Group", "label": "advanced", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired": false, "secret": false, "description": "To group N parts together" },
+    "trim": { "kind": "attribute", "displayName": "Trim", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": true, "description": "Whether to trim the value to remove leading and trailing whitespaces and line breaks" },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json
index 98e53de..199af35 100644
--- a/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json
+++ b/core/camel-core-model/src/generated/resources/org/apache/camel/model/loadbalancer/weighted.json
@@ -13,8 +13,8 @@
   },
   "properties": {
     "distributionRatio": { "kind": "attribute", "displayName": "Distribution Ratio", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The distribution ratio is a delimited String consisting on integer weights separated by delimiters for example 2,3,5. The distributionRatio must match the number of endpoints and\/or processors specified in the load balancer list." },
-    "distributionRatioDelimiter": { "kind": "attribute", "displayName": "Distribution Ratio Delimiter", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": ",", "description": "Delimiter used to specify the distribution ratio. The default value is , (comma)" },
-    "roundRobin": { "kind": "attribute", "displayName": "Round Robin", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "To enable round robin mode. By default the weighted distribution mode is used. The default value is false." },
+    "distributionRatioDelimiter": { "kind": "attribute", "displayName": "Distribution Ratio Delimiter", "label": "advanced", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": ",", "description": "Delimiter used to specify the distribution ratio. The default value is , (comma)" },
+    "roundRobin": { "kind": "attribute", "displayName": "Round Robin", "label": "advanced", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "To enable round robin mode. By default the weighted distribution mode is used. The default value is false." },
     "id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The id of this node" }
   }
 }
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
index 4c7cb95..90b2ed8 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/config/BatchResequencerConfig.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "batch-config")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class BatchResequencerConfig extends ResequencerConfig {
+
     @XmlAttribute
     @Metadata(defaultValue = "100", javaType = "java.lang.Integer")
     private String batchSize;
@@ -37,13 +38,13 @@ public class BatchResequencerConfig extends ResequencerConfig {
     @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
     private String batchTimeout;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String allowDuplicates;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String reverse;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String ignoreInvalidExchanges;
 
     /**
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java b/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
index ecfd115..405a1f1 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/config/StreamResequencerConfig.java
@@ -43,13 +43,13 @@ public class StreamResequencerConfig extends ResequencerConfig {
     @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
     private String timeout;
     @XmlAttribute
-    @Metadata(defaultValue = "1000", javaType = "java.time.Duration")
+    @Metadata(label = "advanced", defaultValue = "1000", javaType = "java.time.Duration")
     private String deliveryAttemptInterval;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String ignoreInvalidExchanges;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String rejectOld;
     @XmlAttribute
     @Metadata(label = "advanced", javaType = "org.apache.camel.processor.resequencer.ExpressionResultComparator")
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/DatasonnetExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/DatasonnetExpression.java
index fac6490..6a9616a 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/DatasonnetExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/DatasonnetExpression.java
@@ -35,13 +35,10 @@ public class DatasonnetExpression extends ExpressionDefinition {
 
     @XmlAttribute(name = "bodyMediaType")
     private String bodyMediaType;
-
     @XmlAttribute(name = "outputMediaType")
     private String outputMediaType;
-
     @XmlAttribute(name = "resultType")
     private String resultTypeName;
-
     @XmlTransient
     private Class<?> resultType;
 
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
index c22db57..e755c76 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/ExpressionDefinition.java
@@ -52,6 +52,14 @@ import org.apache.camel.util.ObjectHelper;
 public class ExpressionDefinition
         implements Expression, Predicate, ExpressionFactory, ExpressionFactoryAware, PredicateFactory, PredicateFactoryAware,
         HasExpressionType {
+
+    @XmlTransient
+    private Predicate predicate;
+    @XmlTransient
+    private Expression expressionValue;
+    @XmlTransient
+    private ExpressionDefinition expressionType;
+
     @XmlAttribute
     @XmlID
     private String id;
@@ -59,14 +67,8 @@ public class ExpressionDefinition
     @Metadata(required = true)
     private String expression;
     @XmlAttribute
-    @Metadata(defaultValue = "true", javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", defaultValue = "true", javaType = "java.lang.Boolean")
     private String trim;
-    @XmlTransient
-    private Predicate predicate;
-    @XmlTransient
-    private Expression expressionValue;
-    @XmlTransient
-    private ExpressionDefinition expressionType;
 
     public ExpressionDefinition() {
     }
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/JoorExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/JoorExpression.java
index 44494da..fba17d4 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/JoorExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/JoorExpression.java
@@ -33,15 +33,15 @@ import org.apache.camel.spi.Metadata;
 public class JoorExpression extends ExpressionDefinition {
 
     @XmlAttribute
-    @Metadata(defaultValue = "true", javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", defaultValue = "true", javaType = "java.lang.Boolean")
     private String preCompile;
+    @XmlAttribute
+    @Metadata(label = "advanced", defaultValue = "true", javaType = "java.lang.Boolean")
+    private String singleQuotes;
     @XmlAttribute(name = "resultType")
     private String resultTypeName;
     @XmlTransient
     private Class<?> resultType;
-    @XmlAttribute
-    @Metadata(defaultValue = "true", javaType = "java.lang.Boolean")
-    private String singleQuotes;
 
     public JoorExpression() {
     }
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/JsonPathExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
index 766ec58..bae9b50 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/JsonPathExpression.java
@@ -40,18 +40,20 @@ public class JsonPathExpression extends ExpressionDefinition {
     @Metadata(defaultValue = "false", javaType = "java.lang.Boolean")
     private String suppressExceptions;
     @XmlAttribute
-    @Metadata(defaultValue = "true", javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", defaultValue = "true", javaType = "java.lang.Boolean")
     private String allowSimple;
     @XmlAttribute
-    @Metadata(defaultValue = "true", javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", defaultValue = "true", javaType = "java.lang.Boolean")
     private String allowEasyPredicate;
     @XmlAttribute
     @Metadata(defaultValue = "false", javaType = "java.lang.Boolean")
     private String writeAsString;
     @XmlAttribute
+    @Metadata(label = "advanced")
     private String headerName;
     @XmlAttribute
-    @Metadata(enums = "DEFAULT_PATH_LEAF_TO_NULL,ALWAYS_RETURN_LIST,AS_PATH_LIST,SUPPRESS_EXCEPTIONS,REQUIRE_PROPERTIES")
+    @Metadata(label = "advanced",
+              enums = "DEFAULT_PATH_LEAF_TO_NULL,ALWAYS_RETURN_LIST,AS_PATH_LIST,SUPPRESS_EXCEPTIONS,REQUIRE_PROPERTIES")
     private String option;
 
     public JsonPathExpression() {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/LanguageExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/LanguageExpression.java
index 9ddd9c3..32c8df3 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/LanguageExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/LanguageExpression.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "language")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class LanguageExpression extends ExpressionDefinition {
+
     @XmlAttribute(required = true)
     private String language;
 
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
index 62ed6aa..b92a728 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
@@ -33,6 +33,12 @@ import org.apache.camel.util.StringHelper;
 @XmlRootElement(name = "method")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class MethodCallExpression extends ExpressionDefinition {
+
+    @XmlTransient
+    private Class<?> beanType;
+    @XmlTransient
+    private Object instance;
+
     @XmlAttribute
     private String ref;
     @XmlAttribute
@@ -40,12 +46,8 @@ public class MethodCallExpression extends ExpressionDefinition {
     @XmlAttribute(name = "beanType")
     private String beanTypeName;
     @XmlAttribute
-    @Metadata(defaultValue = "Singleton", enums = "Singleton,Request,Prototype")
+    @Metadata(label = "advanced", defaultValue = "Singleton", enums = "Singleton,Request,Prototype")
     private String scope;
-    @XmlTransient
-    private Class<?> beanType;
-    @XmlTransient
-    private Object instance;
 
     public MethodCallExpression() {
     }
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
index f898d42..9cf236f 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/NamespaceAwareExpression.java
@@ -30,6 +30,7 @@ import org.apache.camel.spi.NamespaceAware;
  */
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class NamespaceAwareExpression extends ExpressionDefinition implements NamespaceAware {
+
     @XmlTransient
     private Map<String, String> namespaces;
 
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/SimpleExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/SimpleExpression.java
index dc62535..5760d22 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/SimpleExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/SimpleExpression.java
@@ -32,6 +32,7 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "simple")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class SimpleExpression extends ExpressionDefinition {
+
     @XmlAttribute(name = "resultType")
     private String resultTypeName;
     @XmlTransient
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/TokenizerExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
index 8ff6d31..e74dacd 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/TokenizerExpression.java
@@ -30,16 +30,19 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "tokenize")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class TokenizerExpression extends ExpressionDefinition {
+
     @XmlAttribute(required = true)
     private String token;
     @XmlAttribute
     private String endToken;
     @XmlAttribute
+    @Metadata(label = "advanced")
     private String inheritNamespaceTagName;
     @XmlAttribute
+    @Metadata(label = "advanced")
     private String headerName;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String regex;
     @XmlAttribute
     @Metadata(javaType = "java.lang.Boolean")
@@ -48,11 +51,13 @@ public class TokenizerExpression extends ExpressionDefinition {
     @Metadata(javaType = "java.lang.Boolean")
     private String includeTokens;
     @XmlAttribute
+    @Metadata(label = "advanced")
     private String group;
     @XmlAttribute
+    @Metadata(label = "advanced")
     private String groupDelimiter;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String skipFirst;
 
     public TokenizerExpression() {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
index ac7491c..ac588b1 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XMLTokenizerExpression.java
@@ -30,13 +30,15 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "xtokenize")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class XMLTokenizerExpression extends NamespaceAwareExpression {
+
     @XmlAttribute
+    @Metadata(label = "advanced")
     private String headerName;
     @XmlAttribute
-    @Metadata(enums = "i,w,u,t")
+    @Metadata(label = "advanced", enums = "i,w,u,t")
     private String mode;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Integer")
+    @Metadata(label = "advanced", javaType = "java.lang.Integer")
     private String group;
 
     public XMLTokenizerExpression() {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java
index e14cb7a..f463db2 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XPathExpression.java
@@ -34,13 +34,21 @@ import org.apache.camel.spi.Metadata;
 @XmlAccessorType(XmlAccessType.FIELD)
 public class XPathExpression extends NamespaceAwareExpression {
 
+    @XmlTransient
+    private Class<?> documentType;
+    @XmlTransient
+    private Class<?> resultType;
+    @XmlTransient
+    private XPathFactory xpathFactory;
+
     @XmlAttribute(name = "documentType")
+    @Metadata(label = "advanced")
     private String documentTypeName;
     @XmlAttribute(name = "resultType")
     @Metadata(defaultValue = "NODESET", enums = "NUMBER,STRING,BOOLEAN,NODESET,NODE")
     private String resultTypeName;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String saxon;
     @XmlAttribute
     @Metadata(label = "advanced")
@@ -49,16 +57,11 @@ public class XPathExpression extends NamespaceAwareExpression {
     @Metadata(label = "advanced")
     private String objectModel;
     @XmlAttribute
-    @Metadata(javaType = "java.lang.Boolean")
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String logNamespaces;
     @XmlAttribute
+    @Metadata(label = "advanced")
     private String headerName;
-    @XmlTransient
-    private Class<?> documentType;
-    @XmlTransient
-    private Class<?> resultType;
-    @XmlTransient
-    private XPathFactory xpathFactory;
     @XmlAttribute
     @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String threadSafety;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/language/XQueryExpression.java b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XQueryExpression.java
index a3ac61d..dfb7260 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/language/XQueryExpression.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/language/XQueryExpression.java
@@ -31,17 +31,20 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "xquery")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class XQueryExpression extends NamespaceAwareExpression {
-    @XmlAttribute
-    private String type;
+
     @XmlTransient
     private Class<?> resultType;
+    @XmlTransient
+    private Object configuration;
+
     @XmlAttribute
+    private String type;
+    @XmlAttribute
+    @Metadata(label = "advanced")
     private String headerName;
     @XmlAttribute
     @Metadata(label = "advanced")
     private String configurationRef;
-    @XmlTransient
-    private Object configuration;
 
     public XQueryExpression() {
     }
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
index 9147441..161111c 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/CustomLoadBalancerDefinition.java
@@ -36,6 +36,7 @@ public class CustomLoadBalancerDefinition extends LoadBalancerDefinition {
 
     @XmlTransient
     private LoadBalancer loadBalancer;
+
     @XmlAttribute(required = true)
     private String ref;
 
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
index c235711..b515b89 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/FailoverLoadBalancerDefinition.java
@@ -38,6 +38,7 @@ import org.apache.camel.spi.Metadata;
 public class FailoverLoadBalancerDefinition extends LoadBalancerDefinition {
     @XmlTransient
     private List<Class<?>> exceptionTypes = new ArrayList<>();
+
     @XmlElement(name = "exception")
     private List<String> exceptions = new ArrayList<>();
     @XmlAttribute
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
index eb41137..91aecfa 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/StickyLoadBalancerDefinition.java
@@ -35,6 +35,7 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "sticky")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class StickyLoadBalancerDefinition extends LoadBalancerDefinition {
+
     @XmlElement(name = "correlationExpression", required = true)
     private ExpressionSubElementDefinition correlationExpression;
 
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
index 5545c3c..2dc334e 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/loadbalancer/WeightedLoadBalancerDefinition.java
@@ -31,12 +31,14 @@ import org.apache.camel.spi.Metadata;
 @XmlRootElement(name = "weighted")
 @XmlAccessorType(XmlAccessType.FIELD)
 public class WeightedLoadBalancerDefinition extends LoadBalancerDefinition {
+
     @XmlAttribute(required = true)
     private String distributionRatio;
     @XmlAttribute
-    @Metadata(defaultValue = ",")
+    @Metadata(label = "advanced", defaultValue = ",")
     private String distributionRatioDelimiter;
     @XmlAttribute
+    @Metadata(label = "advanced", javaType = "java.lang.Boolean")
     private String roundRobin;
 
     public WeightedLoadBalancerDefinition() {
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
index c2b6da7..acc2d9d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/CustomTransformerDefinition.java
@@ -44,8 +44,6 @@ public class CustomTransformerDefinition extends TransformerDefinition {
 
     /**
      * Set a bean reference of the {@link Transformer}
-     *
-     * @param ref the bean reference of the Transformer
      */
     public void setRef(String ref) {
         this.ref = ref;
@@ -57,8 +55,6 @@ public class CustomTransformerDefinition extends TransformerDefinition {
 
     /**
      * Set a class name of the {@link Transformer}
-     *
-     * @param className the class name of the Transformer
      */
     public void setClassName(String className) {
         this.className = className;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
index 4219631..d10d67e 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/DataFormatTransformerDefinition.java
@@ -77,46 +77,46 @@ import org.apache.camel.spi.Metadata;
 public class DataFormatTransformerDefinition extends TransformerDefinition {
 
     @XmlElements({
-            @XmlElement(required = false, name = "any23", type = Any23DataFormat.class),
-            @XmlElement(required = false, name = "asn1", type = ASN1DataFormat.class),
-            @XmlElement(required = false, name = "avro", type = AvroDataFormat.class),
-            @XmlElement(required = false, name = "barcode", type = BarcodeDataFormat.class),
-            @XmlElement(required = false, name = "base64", type = Base64DataFormat.class),
-            @XmlElement(required = false, name = "beanio", type = BeanioDataFormat.class),
-            @XmlElement(required = false, name = "bindy", type = BindyDataFormat.class),
-            @XmlElement(required = false, name = "cbor", type = CBORDataFormat.class),
-            @XmlElement(required = false, name = "crypto", type = CryptoDataFormat.class),
-            @XmlElement(required = false, name = "csv", type = CsvDataFormat.class),
-            @XmlElement(required = false, name = "custom", type = CustomDataFormat.class),
-            @XmlElement(required = false, name = "fhirJson", type = FhirJsonDataFormat.class),
-            @XmlElement(required = false, name = "fhirXml", type = FhirXmlDataFormat.class),
-            @XmlElement(required = false, name = "flatpack", type = FlatpackDataFormat.class),
-            @XmlElement(required = false, name = "grok", type = GrokDataFormat.class),
-            @XmlElement(required = false, name = "gzipDeflater", type = GzipDeflaterDataFormat.class),
-            @XmlElement(required = false, name = "hl7", type = HL7DataFormat.class),
-            @XmlElement(required = false, name = "ical", type = IcalDataFormat.class),
-            @XmlElement(required = false, name = "jacksonXml", type = JacksonXMLDataFormat.class),
-            @XmlElement(required = false, name = "jaxb", type = JaxbDataFormat.class),
-            @XmlElement(required = false, name = "json", type = JsonDataFormat.class),
-            @XmlElement(required = false, name = "jsonApi", type = JsonApiDataFormat.class),
-            @XmlElement(required = false, name = "lzf", type = LZFDataFormat.class),
-            @XmlElement(required = false, name = "mimeMultipart", type = MimeMultipartDataFormat.class),
-            @XmlElement(required = false, name = "protobuf", type = ProtobufDataFormat.class),
-            @XmlElement(required = false, name = "rss", type = RssDataFormat.class),
-            @XmlElement(required = false, name = "soap", type = SoapDataFormat.class),
-            @XmlElement(required = false, name = "syslog", type = SyslogDataFormat.class),
-            @XmlElement(required = false, name = "tarFile", type = TarFileDataFormat.class),
-            @XmlElement(required = false, name = "thrift", type = ThriftDataFormat.class),
-            @XmlElement(required = false, name = "tidyMarkup", type = TidyMarkupDataFormat.class),
-            @XmlElement(required = false, name = "univocityCsv", type = UniVocityCsvDataFormat.class),
-            @XmlElement(required = false, name = "univocityFixed", type = UniVocityFixedDataFormat.class),
-            @XmlElement(required = false, name = "univocityTsv", type = UniVocityTsvDataFormat.class),
-            @XmlElement(required = false, name = "xmlSecurity", type = XMLSecurityDataFormat.class),
-            @XmlElement(required = false, name = "xstream", type = XStreamDataFormat.class),
-            @XmlElement(required = false, name = "pgp", type = PGPDataFormat.class),
-            @XmlElement(required = false, name = "yaml", type = YAMLDataFormat.class),
-            @XmlElement(required = false, name = "zipDeflater", type = ZipDeflaterDataFormat.class),
-            @XmlElement(required = false, name = "zipFile", type = ZipFileDataFormat.class) })
+            @XmlElement(name = "any23", type = Any23DataFormat.class),
+            @XmlElement(name = "asn1", type = ASN1DataFormat.class),
+            @XmlElement(name = "avro", type = AvroDataFormat.class),
+            @XmlElement(name = "barcode", type = BarcodeDataFormat.class),
+            @XmlElement(name = "base64", type = Base64DataFormat.class),
+            @XmlElement(name = "beanio", type = BeanioDataFormat.class),
+            @XmlElement(name = "bindy", type = BindyDataFormat.class),
+            @XmlElement(name = "cbor", type = CBORDataFormat.class),
+            @XmlElement(name = "crypto", type = CryptoDataFormat.class),
+            @XmlElement(name = "csv", type = CsvDataFormat.class),
+            @XmlElement(name = "custom", type = CustomDataFormat.class),
+            @XmlElement(name = "fhirJson", type = FhirJsonDataFormat.class),
+            @XmlElement(name = "fhirXml", type = FhirXmlDataFormat.class),
+            @XmlElement(name = "flatpack", type = FlatpackDataFormat.class),
+            @XmlElement(name = "grok", type = GrokDataFormat.class),
+            @XmlElement(name = "gzipDeflater", type = GzipDeflaterDataFormat.class),
+            @XmlElement(name = "hl7", type = HL7DataFormat.class),
+            @XmlElement(name = "ical", type = IcalDataFormat.class),
+            @XmlElement(name = "jacksonXml", type = JacksonXMLDataFormat.class),
+            @XmlElement(name = "jaxb", type = JaxbDataFormat.class),
+            @XmlElement(name = "json", type = JsonDataFormat.class),
+            @XmlElement(name = "jsonApi", type = JsonApiDataFormat.class),
+            @XmlElement(name = "lzf", type = LZFDataFormat.class),
+            @XmlElement(name = "mimeMultipart", type = MimeMultipartDataFormat.class),
+            @XmlElement(name = "protobuf", type = ProtobufDataFormat.class),
+            @XmlElement(name = "rss", type = RssDataFormat.class),
+            @XmlElement(name = "soap", type = SoapDataFormat.class),
+            @XmlElement(name = "syslog", type = SyslogDataFormat.class),
+            @XmlElement(name = "tarFile", type = TarFileDataFormat.class),
+            @XmlElement(name = "thrift", type = ThriftDataFormat.class),
+            @XmlElement(name = "tidyMarkup", type = TidyMarkupDataFormat.class),
+            @XmlElement(name = "univocityCsv", type = UniVocityCsvDataFormat.class),
+            @XmlElement(name = "univocityFixed", type = UniVocityFixedDataFormat.class),
+            @XmlElement(name = "univocityTsv", type = UniVocityTsvDataFormat.class),
+            @XmlElement(name = "xmlSecurity", type = XMLSecurityDataFormat.class),
+            @XmlElement(name = "xstream", type = XStreamDataFormat.class),
+            @XmlElement(name = "pgp", type = PGPDataFormat.class),
+            @XmlElement(name = "yaml", type = YAMLDataFormat.class),
+            @XmlElement(name = "zipDeflater", type = ZipDeflaterDataFormat.class),
+            @XmlElement(name = "zipFile", type = ZipFileDataFormat.class) })
     private DataFormatDefinition dataFormatType;
 
     @XmlAttribute
@@ -128,8 +128,6 @@ public class DataFormatTransformerDefinition extends TransformerDefinition {
 
     /**
      * Set the reference of the DataFormat.
-     *
-     * @param ref reference of the DataFormat
      */
     public void setRef(String ref) {
         this.ref = ref;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
index 11a8e1c..fdf456f 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/EndpointTransformerDefinition.java
@@ -46,8 +46,6 @@ public class EndpointTransformerDefinition extends TransformerDefinition {
 
     /**
      * Set the reference of the Endpoint.
-     *
-     * @param ref reference of the Endpoint
      */
     public void setRef(String ref) {
         this.ref = ref;
@@ -59,8 +57,6 @@ public class EndpointTransformerDefinition extends TransformerDefinition {
 
     /**
      * Set the URI of the Endpoint.
-     *
-     * @param uri URI of the Endpoint
      */
     public void setUri(String uri) {
         this.uri = uri;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
index 9abdc08..c87a3d4 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/transformer/TransformersDefinition.java
@@ -35,9 +35,9 @@ import org.apache.camel.spi.Metadata;
 public class TransformersDefinition {
 
     @XmlElements({
-            @XmlElement(required = false, name = "dataFormatTransformer", type = DataFormatTransformerDefinition.class),
-            @XmlElement(required = false, name = "endpointTransformer", type = EndpointTransformerDefinition.class),
-            @XmlElement(required = false, name = "customTransformer", type = CustomTransformerDefinition.class) })
+            @XmlElement(name = "dataFormatTransformer", type = DataFormatTransformerDefinition.class),
+            @XmlElement(name = "endpointTransformer", type = EndpointTransformerDefinition.class),
+            @XmlElement(name = "customTransformer", type = CustomTransformerDefinition.class) })
     private List<TransformerDefinition> transformers;
 
     /**
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
index c404350..a1efa1f 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/CustomValidatorDefinition.java
@@ -44,8 +44,6 @@ public class CustomValidatorDefinition extends ValidatorDefinition {
 
     /**
      * Set a bean reference of the {@link Validator}
-     *
-     * @param ref the bean reference of the Transformer
      */
     public void setRef(String ref) {
         this.ref = ref;
@@ -57,8 +55,6 @@ public class CustomValidatorDefinition extends ValidatorDefinition {
 
     /**
      * Set a class name of the {@link Validator}
-     *
-     * @param className the class name of the Validator
      */
     public void setClassName(String className) {
         this.className = className;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
index 02acfb8..2fd4453 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/EndpointValidatorDefinition.java
@@ -48,8 +48,6 @@ public class EndpointValidatorDefinition extends ValidatorDefinition {
 
     /**
      * Set the reference of the Endpoint.
-     *
-     * @param ref reference of the Endpoint
      */
     public void setRef(String ref) {
         this.ref = ref;
@@ -61,8 +59,6 @@ public class EndpointValidatorDefinition extends ValidatorDefinition {
 
     /**
      * Set the URI of the Endpoint.
-     *
-     * @param uri URI of the Endpoint
      */
     public void setUri(String uri) {
         this.uri = uri;
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
index 276c9f5..4b7b4ef 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorDefinition.java
@@ -52,8 +52,6 @@ public abstract class ValidatorDefinition {
     /**
      * Set the data type name. If you specify 'xml:XYZ', the validator will be picked up if message type is 'xml:XYZ'.
      * If you specify just 'xml', the validator matches with all of 'xml' message type like 'xml:ABC' or 'xml:DEF'.
-     * 
-     * @param type data type name
      */
     public void setType(String type) {
         this.type = type;
@@ -61,8 +59,6 @@ public abstract class ValidatorDefinition {
 
     /**
      * Set the data type using Java class.
-     * 
-     * @param clazz Java class
      */
     public void setType(Class<?> clazz) {
         this.type = new DataType(clazz).toString();
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
index 6822043..696ec86 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/validator/ValidatorsDefinition.java
@@ -35,9 +35,9 @@ import org.apache.camel.spi.Metadata;
 public class ValidatorsDefinition {
 
     @XmlElements({
-            @XmlElement(required = false, name = "endpointValidator", type = EndpointValidatorDefinition.class),
-            @XmlElement(required = false, name = "predicateValidator", type = PredicateValidatorDefinition.class),
-            @XmlElement(required = false, name = "customValidator", type = CustomValidatorDefinition.class) })
+            @XmlElement(name = "endpointValidator", type = EndpointValidatorDefinition.class),
+            @XmlElement(name = "predicateValidator", type = PredicateValidatorDefinition.class),
+            @XmlElement(name = "customValidator", type = CustomValidatorDefinition.class) })
     private List<ValidatorDefinition> validators;
 
     /**
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
index 52b5972..3cee3d0 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-deserializers/src/generated/java/org/apache/camel/dsl/yaml/deserializers/ModelDeserializers.java
@@ -17213,7 +17213,7 @@ public final class ModelDeserializers extends YamlDeserializerSupport {
                     @YamlProperty(name = "distribution-ratio", type = "string", required = true),
                     @YamlProperty(name = "distribution-ratio-delimiter", type = "string"),
                     @YamlProperty(name = "id", type = "string"),
-                    @YamlProperty(name = "round-robin", type = "string")
+                    @YamlProperty(name = "round-robin", type = "boolean")
             }
     )
     public static class WeightedLoadBalancerDefinitionDeserializer extends YamlDeserializerBase<WeightedLoadBalancerDefinition> {
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
index ccabf7d..6577fc4 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camel-yaml-dsl.json
@@ -6522,7 +6522,7 @@
             "type" : "string"
           },
           "round-robin" : {
-            "type" : "string"
+            "type" : "boolean"
           }
         },
         "required" : [ "distribution-ratio" ]
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
index db28585..421c8e4 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/generated/resources/camelYamlDsl.json
@@ -6420,7 +6420,7 @@
             "type" : "string"
           },
           "roundRobin" : {
-            "type" : "string"
+            "type" : "boolean"
           }
         },
         "required" : [ "distributionRatio" ]
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy
index 72b0821..9dc377f 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl/src/test/groovy/org/apache/camel/dsl/yaml/LoadBalanceTest.groovy
@@ -30,7 +30,7 @@ class LoadBalanceTest extends YamlTestSupport {
                      - load-balance:
                          weighted:
                            distribution-ratio: "2,1"
-                           round-robin: "false"
+                           round-robin: false
                          steps:
                            - to: "mock:x"
                            - to: "mock:y"