You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by gn...@apache.org on 2019/06/11 16:15:58 UTC

[camel] 05/05: Fix javadoc generated for the type to use < and >

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

gnodet pushed a commit to branch endpoint-dsl
in repository https://gitbox.apache.org/repos/asf/camel.git

commit b56e661ff260d8d17b56059283020b8ca0e6299a
Author: Guillaume Nodet <gn...@gmail.com>
AuthorDate: Tue Jun 11 18:12:57 2019 +0200

    Fix javadoc generated for the type to use &lt; and &gt;
---
 .../camel/model/endpoint/AhcEndpointBuilder.java   | 15 +++---
 .../camel/model/endpoint/ApnsEndpointBuilder.java  |  7 +--
 .../camel/model/endpoint/AtomEndpointBuilder.java  |  7 +--
 .../model/endpoint/AtomixMapEndpointBuilder.java   | 28 +++++------
 .../endpoint/AtomixMessagingEndpointBuilder.java   | 28 +++++------
 .../endpoint/AtomixMultiMapEndpointBuilder.java    | 28 +++++------
 .../model/endpoint/AtomixQueueEndpointBuilder.java | 28 +++++------
 .../model/endpoint/AtomixSetEndpointBuilder.java   | 28 +++++------
 .../model/endpoint/AtomixValueEndpointBuilder.java | 28 +++++------
 .../camel/model/endpoint/BeanEndpointBuilder.java  |  8 ++--
 .../model/endpoint/BeanstalkEndpointBuilder.java   |  7 +--
 .../model/endpoint/BlobServiceEndpointBuilder.java |  6 ++-
 .../camel/model/endpoint/BoxEndpointBuilder.java   |  7 +--
 .../endpoint/CaffeineCacheEndpointBuilder.java     | 10 ++--
 .../endpoint/CaffeineLoadCacheEndpointBuilder.java | 10 ++--
 .../model/endpoint/CassandraEndpointBuilder.java   |  7 +--
 .../camel/model/endpoint/ClassEndpointBuilder.java |  8 ++--
 .../model/endpoint/CouchbaseEndpointBuilder.java   |  7 +--
 .../model/endpoint/CryptoCmsEndpointBuilder.java   |  8 ++--
 .../camel/model/endpoint/CxfEndpointBuilder.java   | 11 +++--
 .../camel/model/endpoint/CxfRsEndpointBuilder.java | 22 +++++----
 .../model/endpoint/DdbStreamEndpointBuilder.java   |  7 +--
 .../model/endpoint/EhcacheEndpointBuilder.java     | 26 ++++++-----
 .../camel/model/endpoint/EjbEndpointBuilder.java   |  8 ++--
 .../camel/model/endpoint/ElsqlEndpointBuilder.java | 14 +++---
 .../camel/model/endpoint/EtcdEndpointBuilder.java  |  7 +--
 .../model/endpoint/FacebookEndpointBuilder.java    | 31 +++++++------
 .../camel/model/endpoint/FileEndpointBuilder.java  | 29 ++++++------
 .../model/endpoint/FlatpackEndpointBuilder.java    |  7 +--
 .../camel/model/endpoint/FtpEndpointBuilder.java   | 42 +++++++++--------
 .../camel/model/endpoint/FtpsEndpointBuilder.java  | 54 +++++++++++++---------
 .../GoogleCalendarStreamEndpointBuilder.java       | 13 +++---
 .../model/endpoint/GoogleDriveEndpointBuilder.java |  4 +-
 .../endpoint/GoogleMailStreamEndpointBuilder.java  |  7 +--
 .../GoogleSheetsStreamEndpointBuilder.java         | 11 +++--
 .../endpoint/GuavaEventBusEndpointBuilder.java     |  9 ++--
 .../camel/model/endpoint/HBaseEndpointBuilder.java | 15 +++---
 .../camel/model/endpoint/HdfsEndpointBuilder.java  |  7 +--
 .../model/endpoint/HipchatEndpointBuilder.java     |  7 +--
 .../camel/model/endpoint/HttpEndpointBuilder.java  |  9 ++--
 .../model/endpoint/IgniteCacheEndpointBuilder.java |  8 ++--
 .../endpoint/IgniteEventsEndpointBuilder.java      |  6 +--
 .../model/endpoint/InfinispanEndpointBuilder.java  | 12 ++---
 .../model/endpoint/IronMQEndpointBuilder.java      |  7 +--
 .../camel/model/endpoint/JBPMEndpointBuilder.java  | 17 +++----
 .../model/endpoint/JCacheEndpointBuilder.java      | 22 ++++-----
 .../camel/model/endpoint/JMXEndpointBuilder.java   |  6 ++-
 .../camel/model/endpoint/JdbcEndpointBuilder.java  |  6 ++-
 .../model/endpoint/JettyHttpEndpointBuilder9.java  | 26 +++++++----
 .../camel/model/endpoint/JooqEndpointBuilder.java  | 11 +++--
 .../camel/model/endpoint/JpaEndpointBuilder.java   | 38 ++++++++-------
 .../camel/model/endpoint/Jt400EndpointBuilder.java |  7 +--
 .../camel/model/endpoint/KafkaEndpointBuilder.java |  8 ++--
 .../model/endpoint/KinesisEndpointBuilder.java     |  7 +--
 .../model/endpoint/LinkedInEndpointBuilder.java    |  6 ++-
 .../camel/model/endpoint/MailEndpointBuilder.java  |  7 +--
 .../model/endpoint/MicrometerEndpointBuilder.java  |  6 +--
 .../model/endpoint/MiloClientEndpointBuilder.java  |  4 +-
 .../camel/model/endpoint/Mina2EndpointBuilder.java |  4 +-
 .../model/endpoint/MyBatisEndpointBuilder.java     |  7 +--
 .../camel/model/endpoint/NettyEndpointBuilder.java | 18 +++++---
 .../model/endpoint/NettyHttpEndpointBuilder.java   | 26 +++++++----
 .../model/endpoint/Olingo2EndpointBuilder.java     |  6 ++-
 .../model/endpoint/Olingo4EndpointBuilder.java     |  6 ++-
 .../model/endpoint/PropertiesEndpointBuilder.java  |  4 +-
 .../model/endpoint/QuartzEndpointBuilder.java      | 14 +++---
 .../model/endpoint/RabbitMQEndpointBuilder.java    | 11 +++--
 .../model/endpoint/RestletEndpointBuilder.java     |  7 +--
 .../camel/model/endpoint/RssEndpointBuilder.java   |  7 +--
 .../camel/model/endpoint/S3EndpointBuilder.java    |  7 +--
 .../camel/model/endpoint/SWFEndpointBuilder.java   | 21 +++++----
 .../model/endpoint/SalesforceEndpointBuilder.java  | 13 ++++--
 .../model/endpoint/SchedulerEndpointBuilder.java   |  7 +--
 .../model/endpoint/ServiceNowEndpointBuilder.java  | 24 +++++-----
 .../camel/model/endpoint/SesEndpointBuilder.java   |  8 ++--
 .../camel/model/endpoint/SftpEndpointBuilder.java  | 29 ++++++------
 .../camel/model/endpoint/SipEndpointBuilder.java   |  4 +-
 .../camel/model/endpoint/SlackEndpointBuilder.java |  7 +--
 .../camel/model/endpoint/SmppEndpointBuilder.java  |  8 ++--
 .../camel/model/endpoint/SnmpEndpointBuilder.java  |  7 +--
 .../model/endpoint/SplunkEndpointBuilder.java      |  7 +--
 .../camel/model/endpoint/SqlEndpointBuilder.java   | 14 +++---
 .../camel/model/endpoint/SqsEndpointBuilder.java   |  7 +--
 .../camel/model/endpoint/SshEndpointBuilder.java   |  7 +--
 .../model/endpoint/StreamEndpointBuilder.java      |  9 ++--
 .../model/endpoint/TelegramEndpointBuilder.java    |  7 +--
 .../TwitterDirectMessageEndpointBuilder.java       |  7 +--
 .../endpoint/TwitterSearchEndpointBuilder.java     |  7 +--
 .../endpoint/TwitterStreamingEndpointBuilder.java  |  7 +--
 .../endpoint/TwitterTimelineEndpointBuilder.java   |  7 +--
 .../model/endpoint/UndertowEndpointBuilder.java    |  7 +--
 .../model/endpoint/WeatherEndpointBuilder.java     | 13 +++---
 .../camel/model/endpoint/Web3jEndpointBuilder.java | 14 +++---
 .../model/endpoint/WordpressEndpointBuilder.java   |  7 +--
 .../camel/model/endpoint/WsEndpointBuilder.java    | 15 +++---
 .../model/endpoint/XQueryEndpointBuilder.java      | 31 ++++++++-----
 .../endpoint/XmlSignatureEndpointBuilder.java      | 17 ++++---
 .../camel/model/endpoint/XsltEndpointBuilder.java  |  5 +-
 .../model/endpoint/YammerEndpointBuilder.java      |  7 +--
 .../camel/maven/packaging/EndpointDslMojo.java     |  8 +++-
 100 files changed, 694 insertions(+), 573 deletions(-)

diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AhcEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AhcEndpointBuilder.java
index 3b1c6f5..749e5ab 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AhcEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AhcEndpointBuilder.java
@@ -220,8 +220,8 @@ public interface AhcEndpointBuilder {
         }
         /**
          * To configure the AsyncHttpClientConfig using the key/values from the
-         * Map. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * Map. The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T clientConfigOptions(Map<String, Object> clientConfigOptions) {
             this.properties.put("clientConfigOptions", clientConfigOptions);
@@ -230,7 +230,8 @@ public interface AhcEndpointBuilder {
         /**
          * To configure the AsyncHttpClientConfig using the key/values from the
          * Map. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T clientConfigOptions(String clientConfigOptions) {
             this.properties.put("clientConfigOptions", clientConfigOptions);
@@ -256,8 +257,9 @@ public interface AhcEndpointBuilder {
         }
         /**
          * To configure the AsyncHttpClientConfig Realm using the key/values
-         * from the Map. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * from the Map. The option is a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T clientConfigRealmOptions(
                 Map<String, Object> clientConfigRealmOptions) {
@@ -267,7 +269,8 @@ public interface AhcEndpointBuilder {
         /**
          * To configure the AsyncHttpClientConfig Realm using the key/values
          * from the Map. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T clientConfigRealmOptions(String clientConfigRealmOptions) {
             this.properties.put("clientConfigRealmOptions", clientConfigRealmOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ApnsEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ApnsEndpointBuilder.java
index aa3612c..274961f 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ApnsEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ApnsEndpointBuilder.java
@@ -403,7 +403,8 @@ public interface ApnsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public ApnsConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -413,8 +414,8 @@ public interface ApnsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public ApnsConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomEndpointBuilder.java
index a84fd8c..98acdaf 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomEndpointBuilder.java
@@ -516,7 +516,8 @@ public interface AtomEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public AtomConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -526,8 +527,8 @@ public interface AtomEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public AtomConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMapEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMapEndpointBuilder.java
index 51a8cf3..051de76 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMapEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMapEndpointBuilder.java
@@ -109,8 +109,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -119,8 +118,7 @@ public interface AtomixMapEndpointBuilder {
         /**
          * The address of the nodes composing the cluster. The option will be
          * converted to a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -136,8 +134,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -145,8 +142,7 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
@@ -255,8 +251,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -264,8 +260,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -273,8 +269,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -282,8 +278,8 @@ public interface AtomixMapEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMessagingEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMessagingEndpointBuilder.java
index 9d92a86..67429cb 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMessagingEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMessagingEndpointBuilder.java
@@ -123,8 +123,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -133,8 +132,7 @@ public interface AtomixMessagingEndpointBuilder {
         /**
          * The address of the nodes composing the cluster. The option will be
          * converted to a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -150,8 +148,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -159,8 +156,7 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
@@ -254,8 +250,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -263,8 +259,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -272,8 +268,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -281,8 +277,8 @@ public interface AtomixMessagingEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMultiMapEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMultiMapEndpointBuilder.java
index b55183b..6414326 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMultiMapEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixMultiMapEndpointBuilder.java
@@ -110,8 +110,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -120,8 +119,7 @@ public interface AtomixMultiMapEndpointBuilder {
         /**
          * The address of the nodes composing the cluster. The option will be
          * converted to a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -137,8 +135,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -146,8 +143,7 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
@@ -256,8 +252,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -265,8 +261,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -274,8 +270,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -283,8 +279,8 @@ public interface AtomixMultiMapEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixQueueEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixQueueEndpointBuilder.java
index e16feb2..f3f2fe1 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixQueueEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixQueueEndpointBuilder.java
@@ -91,8 +91,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -101,8 +100,7 @@ public interface AtomixQueueEndpointBuilder {
         /**
          * The address of the nodes composing the cluster. The option will be
          * converted to a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -118,8 +116,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -127,8 +124,7 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
@@ -222,8 +218,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -231,8 +227,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -240,8 +236,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -249,8 +245,8 @@ public interface AtomixQueueEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixSetEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixSetEndpointBuilder.java
index cca708a..8c60726 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixSetEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixSetEndpointBuilder.java
@@ -91,8 +91,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -101,8 +100,7 @@ public interface AtomixSetEndpointBuilder {
         /**
          * The address of the nodes composing the cluster. The option will be
          * converted to a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -118,8 +116,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -127,8 +124,7 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
@@ -237,8 +233,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -246,8 +242,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -255,8 +251,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -264,8 +260,8 @@ public interface AtomixSetEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixValueEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixValueEndpointBuilder.java
index a94a6dd..b9f43de 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixValueEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/AtomixValueEndpointBuilder.java
@@ -91,8 +91,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * The address of the nodes composing the cluster. The option is a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(List<Object> nodes) {
             this.properties.put("nodes", nodes);
@@ -101,8 +100,7 @@ public interface AtomixValueEndpointBuilder {
         /**
          * The address of the nodes composing the cluster. The option will be
          * converted to a
-         * <code>java.util.List<io.atomix.catalyst.transport.Address></code>
-         * type.
+         * <code>java.util.List&lt;io.atomix.catalyst.transport.Address&gt;</code> type.
          */
         public T nodes(String nodes) {
             this.properties.put("nodes", nodes);
@@ -118,8 +116,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option is a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(Class<Object> transport) {
             this.properties.put("transport", transport);
@@ -127,8 +124,7 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Sets the Atomix transport. The option will be converted to a
-         * <code>java.lang.Class<io.atomix.catalyst.transport.Transport></code>
-         * type.
+         * <code>java.lang.Class&lt;io.atomix.catalyst.transport.Transport&gt;</code> type.
          */
         public T transport(String transport) {
             this.properties.put("transport", transport);
@@ -237,8 +233,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(Map<String, Properties> resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -246,8 +242,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Cluster wide resources configuration. The option will be converted to
-         * a <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceConfigs(String resourceConfigs) {
             this.properties.put("resourceConfigs", resourceConfigs);
@@ -255,8 +251,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Local resources configurations. The option is a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(Map<String, Properties> resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
@@ -264,8 +260,8 @@ public interface AtomixValueEndpointBuilder {
         }
         /**
          * Local resources configurations. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.util.Properties></code>
-         * type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.util.Properties&gt;</code> type.
          */
         public T resourceOptions(String resourceOptions) {
             this.properties.put("resourceOptions", resourceOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanEndpointBuilder.java
index 8f7de8e..b321765 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanEndpointBuilder.java
@@ -93,8 +93,8 @@ public interface BeanEndpointBuilder {
         }
         /**
          * Used for configuring additional properties on the bean. The option is
-         * a <code>java.util.Map<java.lang.String, java.lang.Object></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T parameters(Map<String, Object> parameters) {
             this.properties.put("parameters", parameters);
@@ -102,8 +102,8 @@ public interface BeanEndpointBuilder {
         }
         /**
          * Used for configuring additional properties on the bean. The option
-         * will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * will be converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T parameters(String parameters) {
             this.properties.put("parameters", parameters);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanstalkEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanstalkEndpointBuilder.java
index 1a105c2..4b7e0e3 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanstalkEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BeanstalkEndpointBuilder.java
@@ -531,7 +531,8 @@ public interface BeanstalkEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public BeanstalkConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -541,8 +542,8 @@ public interface BeanstalkEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public BeanstalkConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BlobServiceEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BlobServiceEndpointBuilder.java
index fda407a..be8d509 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BlobServiceEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BlobServiceEndpointBuilder.java
@@ -318,7 +318,8 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the blob meta-data. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public BlobServiceProducerBuilder blobMetadata(
                 Map<String, String> blobMetadata) {
@@ -327,7 +328,8 @@ public interface BlobServiceEndpointBuilder {
         }
         /**
          * Set the blob meta-data. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public BlobServiceProducerBuilder blobMetadata(String blobMetadata) {
             this.properties.put("blobMetadata", blobMetadata);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BoxEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BoxEndpointBuilder.java
index eae5e9d..df53493 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BoxEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/BoxEndpointBuilder.java
@@ -116,7 +116,8 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Custom HTTP params for settings like proxy host. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T httpParams(Map<String, Object> httpParams) {
             this.properties.put("httpParams", httpParams);
@@ -124,8 +125,8 @@ public interface BoxEndpointBuilder {
         }
         /**
          * Custom HTTP params for settings like proxy host. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T httpParams(String httpParams) {
             this.properties.put("httpParams", httpParams);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CaffeineCacheEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CaffeineCacheEndpointBuilder.java
index bfb753d..ce50adf 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CaffeineCacheEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CaffeineCacheEndpointBuilder.java
@@ -82,7 +82,7 @@ public interface CaffeineCacheEndpointBuilder {
         }
         /**
          * The cache key type, default java.lang.Object. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T keyType(Class<Object> keyType) {
             this.properties.put("keyType", keyType);
@@ -90,7 +90,8 @@ public interface CaffeineCacheEndpointBuilder {
         }
         /**
          * The cache key type, default java.lang.Object. The option will be
-         * converted to a <code>java.lang.Class<java.lang.Object></code> type.
+         * converted to a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T keyType(String keyType) {
             this.properties.put("keyType", keyType);
@@ -116,7 +117,7 @@ public interface CaffeineCacheEndpointBuilder {
         }
         /**
          * The cache value type, default java.lang.Object. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T valueType(Class<Object> valueType) {
             this.properties.put("valueType", valueType);
@@ -124,7 +125,8 @@ public interface CaffeineCacheEndpointBuilder {
         }
         /**
          * The cache value type, default java.lang.Object. The option will be
-         * converted to a <code>java.lang.Class<java.lang.Object></code> type.
+         * converted to a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T valueType(String valueType) {
             this.properties.put("valueType", valueType);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CaffeineLoadCacheEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CaffeineLoadCacheEndpointBuilder.java
index d326e1b..7b97530 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CaffeineLoadCacheEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CaffeineLoadCacheEndpointBuilder.java
@@ -83,7 +83,7 @@ public interface CaffeineLoadCacheEndpointBuilder {
         }
         /**
          * The cache key type, default java.lang.Object. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T keyType(Class<Object> keyType) {
             this.properties.put("keyType", keyType);
@@ -91,7 +91,8 @@ public interface CaffeineLoadCacheEndpointBuilder {
         }
         /**
          * The cache key type, default java.lang.Object. The option will be
-         * converted to a <code>java.lang.Class<java.lang.Object></code> type.
+         * converted to a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T keyType(String keyType) {
             this.properties.put("keyType", keyType);
@@ -117,7 +118,7 @@ public interface CaffeineLoadCacheEndpointBuilder {
         }
         /**
          * The cache value type, default java.lang.Object. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T valueType(Class<Object> valueType) {
             this.properties.put("valueType", valueType);
@@ -125,7 +126,8 @@ public interface CaffeineLoadCacheEndpointBuilder {
         }
         /**
          * The cache value type, default java.lang.Object. The option will be
-         * converted to a <code>java.lang.Class<java.lang.Object></code> type.
+         * converted to a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T valueType(String valueType) {
             this.properties.put("valueType", valueType);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CassandraEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CassandraEndpointBuilder.java
index 6c26c82..38b760b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CassandraEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CassandraEndpointBuilder.java
@@ -556,7 +556,8 @@ public interface CassandraEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public CassandraConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -566,8 +567,8 @@ public interface CassandraEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public CassandraConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ClassEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ClassEndpointBuilder.java
index 39579f0..75a6ab8 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ClassEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ClassEndpointBuilder.java
@@ -93,8 +93,8 @@ public interface ClassEndpointBuilder {
         }
         /**
          * Used for configuring additional properties on the bean. The option is
-         * a <code>java.util.Map<java.lang.String, java.lang.Object></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T parameters(Map<String, Object> parameters) {
             this.properties.put("parameters", parameters);
@@ -102,8 +102,8 @@ public interface ClassEndpointBuilder {
         }
         /**
          * Used for configuring additional properties on the bean. The option
-         * will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * will be converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T parameters(String parameters) {
             this.properties.put("parameters", parameters);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CouchbaseEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CouchbaseEndpointBuilder.java
index c72a40b..b3138d6 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CouchbaseEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CouchbaseEndpointBuilder.java
@@ -676,7 +676,8 @@ public interface CouchbaseEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public CouchbaseConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -686,8 +687,8 @@ public interface CouchbaseEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public CouchbaseConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CryptoCmsEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CryptoCmsEndpointBuilder.java
index 407e63c..f6b2e98 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CryptoCmsEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CryptoCmsEndpointBuilder.java
@@ -229,7 +229,7 @@ public interface CryptoCmsEndpointBuilder {
          * Recipient Info: reference to a bean which implements the interface
          * org.apache.camel.component.crypto.cms.api.TransRecipientInfo. The
          * option is a
-         * <code>java.util.List<org.apache.camel.component.crypto.cms.crypt.RecipientInfo></code> type.
+         * <code>java.util.List&lt;org.apache.camel.component.crypto.cms.crypt.RecipientInfo&gt;</code> type.
          */
         public T recipient(List<Object> recipient) {
             this.properties.put("recipient", recipient);
@@ -239,7 +239,7 @@ public interface CryptoCmsEndpointBuilder {
          * Recipient Info: reference to a bean which implements the interface
          * org.apache.camel.component.crypto.cms.api.TransRecipientInfo. The
          * option will be converted to a
-         * <code>java.util.List<org.apache.camel.component.crypto.cms.crypt.RecipientInfo></code> type.
+         * <code>java.util.List&lt;org.apache.camel.component.crypto.cms.crypt.RecipientInfo&gt;</code> type.
          */
         public T recipient(String recipient) {
             this.properties.put("recipient", recipient);
@@ -342,7 +342,7 @@ public interface CryptoCmsEndpointBuilder {
          * Signer information: reference to bean(s) which implements
          * org.apache.camel.component.crypto.cms.api.SignerInfo. Multiple values
          * can be separated by comma. The option is a
-         * <code>java.util.List<org.apache.camel.component.crypto.cms.sig.SignerInfo></code> type.
+         * <code>java.util.List&lt;org.apache.camel.component.crypto.cms.sig.SignerInfo&gt;</code> type.
          */
         public T signer(List<Object> signer) {
             this.properties.put("signer", signer);
@@ -352,7 +352,7 @@ public interface CryptoCmsEndpointBuilder {
          * Signer information: reference to bean(s) which implements
          * org.apache.camel.component.crypto.cms.api.SignerInfo. Multiple values
          * can be separated by comma. The option will be converted to a
-         * <code>java.util.List<org.apache.camel.component.crypto.cms.sig.SignerInfo></code> type.
+         * <code>java.util.List&lt;org.apache.camel.component.crypto.cms.sig.SignerInfo&gt;</code> type.
          */
         public T signer(String signer) {
             this.properties.put("signer", signer);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CxfEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CxfEndpointBuilder.java
index 2d5e517..1341398 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CxfEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CxfEndpointBuilder.java
@@ -289,7 +289,8 @@ public interface CxfEndpointBuilder {
          * To set additional CXF options using the key/value pairs from the Map.
          * For example to turn on stacktraces in SOAP faults,
          * properties.faultStackTraceEnabled=true. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T properties(Map<String, Object> properties) {
             this.properties.put("properties", properties);
@@ -299,8 +300,8 @@ public interface CxfEndpointBuilder {
          * To set additional CXF options using the key/value pairs from the Map.
          * For example to turn on stacktraces in SOAP faults,
          * properties.faultStackTraceEnabled=true. The option will be converted
-         * to a <code>java.util.Map<java.lang.String, java.lang.Object></code>
-         * type.
+         * to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T properties(String properties) {
             this.properties.put("properties", properties);
@@ -441,7 +442,7 @@ public interface CxfEndpointBuilder {
         /**
          * The class name of the SEI (Service Endpoint Interface) class which
          * could have JSR181 annotation or not. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T serviceClass(Class<Object> serviceClass) {
             this.properties.put("serviceClass", serviceClass);
@@ -450,7 +451,7 @@ public interface CxfEndpointBuilder {
         /**
          * The class name of the SEI (Service Endpoint Interface) class which
          * could have JSR181 annotation or not. The option will be converted to
-         * a <code>java.lang.Class<java.lang.Object></code> type.
+         * a <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T serviceClass(String serviceClass) {
             this.properties.put("serviceClass", serviceClass);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CxfRsEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CxfRsEndpointBuilder.java
index a912ee7..618af39 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CxfRsEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/CxfRsEndpointBuilder.java
@@ -58,7 +58,8 @@ public interface CxfRsEndpointBuilder {
         }
         /**
          * Set the feature list to the CxfRs endpoint. The option is a
-         * <code>java.util.List<org.apache.cxf.feature.Feature></code> type.
+         * <code>java.util.List&lt;org.apache.cxf.feature.Feature&gt;</code>
+         * type.
          */
         public T features(List<Object> features) {
             this.properties.put("features", features);
@@ -67,7 +68,8 @@ public interface CxfRsEndpointBuilder {
         /**
          * Set the feature list to the CxfRs endpoint. The option will be
          * converted to a
-         * <code>java.util.List<org.apache.cxf.feature.Feature></code> type.
+         * <code>java.util.List&lt;org.apache.cxf.feature.Feature&gt;</code>
+         * type.
          */
         public T features(String features) {
             this.properties.put("features", features);
@@ -123,7 +125,7 @@ public interface CxfRsEndpointBuilder {
          * Set custom JAX-RS provider(s) list to the CxfRs endpoint. You can
          * specify a string with a list of providers to lookup in the registy
          * separated by comma. The option is a
-         * <code>java.util.List<java.lang.Object></code> type.
+         * <code>java.util.List&lt;java.lang.Object&gt;</code> type.
          */
         public T providers(List<Object> providers) {
             this.properties.put("providers", providers);
@@ -133,7 +135,7 @@ public interface CxfRsEndpointBuilder {
          * Set custom JAX-RS provider(s) list to the CxfRs endpoint. You can
          * specify a string with a list of providers to lookup in the registy
          * separated by comma. The option will be converted to a
-         * <code>java.util.List<java.lang.Object></code> type.
+         * <code>java.util.List&lt;java.lang.Object&gt;</code> type.
          */
         public T providers(String providers) {
             this.properties.put("providers", providers);
@@ -142,7 +144,7 @@ public interface CxfRsEndpointBuilder {
         /**
          * The resource classes which you want to export as REST service.
          * Multiple classes can be separated by comma. The option is a
-         * <code>java.util.List<java.lang.Class<java.lang.Object>></code> type.
+         * <code>java.util.List&lt;java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          */
         public T resourceClasses(List<Class<Object>> resourceClasses) {
             this.properties.put("resourceClasses", resourceClasses);
@@ -152,7 +154,7 @@ public interface CxfRsEndpointBuilder {
          * The resource classes which you want to export as REST service.
          * Multiple classes can be separated by comma. The option will be
          * converted to a
-         * <code>java.util.List<java.lang.Class<java.lang.Object>></code> type.
+         * <code>java.util.List&lt;java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          */
         public T resourceClasses(String resourceClasses) {
             this.properties.put("resourceClasses", resourceClasses);
@@ -161,7 +163,7 @@ public interface CxfRsEndpointBuilder {
         /**
          * Sets the locations of the schema(s) which can be used to validate the
          * incoming XML or JAXB-driven JSON. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T schemaLocations(List<String> schemaLocations) {
             this.properties.put("schemaLocations", schemaLocations);
@@ -170,7 +172,7 @@ public interface CxfRsEndpointBuilder {
         /**
          * Sets the locations of the schema(s) which can be used to validate the
          * incoming XML or JAXB-driven JSON. The option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T schemaLocations(String schemaLocations) {
             this.properties.put("schemaLocations", schemaLocations);
@@ -519,7 +521,7 @@ public interface CxfRsEndpointBuilder {
         /**
          * The service beans which you want to export as REST service. Multiple
          * beans can be separated by comma. The option is a
-         * <code>java.util.List<java.lang.Object></code> type.
+         * <code>java.util.List&lt;java.lang.Object&gt;</code> type.
          */
         public CxfRsConsumerBuilder serviceBeans(List<Object> serviceBeans) {
             this.properties.put("serviceBeans", serviceBeans);
@@ -528,7 +530,7 @@ public interface CxfRsEndpointBuilder {
         /**
          * The service beans which you want to export as REST service. Multiple
          * beans can be separated by comma. The option will be converted to a
-         * <code>java.util.List<java.lang.Object></code> type.
+         * <code>java.util.List&lt;java.lang.Object&gt;</code> type.
          */
         public CxfRsConsumerBuilder serviceBeans(String serviceBeans) {
             this.properties.put("serviceBeans", serviceBeans);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/DdbStreamEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/DdbStreamEndpointBuilder.java
index 8fa0a5f..a54aded 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/DdbStreamEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/DdbStreamEndpointBuilder.java
@@ -534,7 +534,8 @@ public interface DdbStreamEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public DdbStreamConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -544,8 +545,8 @@ public interface DdbStreamEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public DdbStreamConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EhcacheEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EhcacheEndpointBuilder.java
index a6098dc..2d1195a 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EhcacheEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EhcacheEndpointBuilder.java
@@ -145,9 +145,9 @@ public interface EhcacheEndpointBuilder {
         }
         /**
          * A map of cache configuration to be used to create caches. The option
-         * is a <code>java.util.Map<java.lang.String,
-         * org.ehcache.config.CacheConfiguration<java.lang.Object,
-         * java.lang.Object>></code> type.
+         * is a <code>java.util.Map&lt;java.lang.String,
+         * org.ehcache.config.CacheConfiguration&lt;java.lang.Object,
+         * java.lang.Object&gt;&gt;</code> type.
          */
         public T configurations(Map<String, Object> configurations) {
             this.properties.put("configurations", configurations);
@@ -155,9 +155,9 @@ public interface EhcacheEndpointBuilder {
         }
         /**
          * A map of cache configuration to be used to create caches. The option
-         * will be converted to a <code>java.util.Map<java.lang.String,
-         * org.ehcache.config.CacheConfiguration<java.lang.Object,
-         * java.lang.Object>></code> type.
+         * will be converted to a <code>java.util.Map&lt;java.lang.String,
+         * org.ehcache.config.CacheConfiguration&lt;java.lang.Object,
+         * java.lang.Object&gt;&gt;</code> type.
          */
         public T configurations(String configurations) {
             this.properties.put("configurations", configurations);
@@ -165,7 +165,7 @@ public interface EhcacheEndpointBuilder {
         }
         /**
          * The cache key type, default java.lang.Object. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T keyType(Class<Object> keyType) {
             this.properties.put("keyType", keyType);
@@ -173,7 +173,8 @@ public interface EhcacheEndpointBuilder {
         }
         /**
          * The cache key type, default java.lang.Object. The option will be
-         * converted to a <code>java.lang.Class<java.lang.Object></code> type.
+         * converted to a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T keyType(String keyType) {
             this.properties.put("keyType", keyType);
@@ -199,7 +200,7 @@ public interface EhcacheEndpointBuilder {
         }
         /**
          * The cache value type, default java.lang.Object. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T valueType(Class<Object> valueType) {
             this.properties.put("valueType", valueType);
@@ -207,7 +208,8 @@ public interface EhcacheEndpointBuilder {
         }
         /**
          * The cache value type, default java.lang.Object. The option will be
-         * converted to a <code>java.lang.Class<java.lang.Object></code> type.
+         * converted to a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T valueType(String valueType) {
             this.properties.put("valueType", valueType);
@@ -285,7 +287,7 @@ public interface EhcacheEndpointBuilder {
         }
         /**
          * Set the type of events to listen for. The option is a
-         * <code>java.util.Set<org.ehcache.event.EventType></code> type.
+         * <code>java.util.Set&lt;org.ehcache.event.EventType&gt;</code> type.
          */
         public EhcacheConsumerBuilder eventTypes(Set<EventType> eventTypes) {
             this.properties.put("eventTypes", eventTypes);
@@ -293,7 +295,7 @@ public interface EhcacheEndpointBuilder {
         }
         /**
          * Set the type of events to listen for. The option will be converted to
-         * a <code>java.util.Set<org.ehcache.event.EventType></code> type.
+         * a <code>java.util.Set&lt;org.ehcache.event.EventType&gt;</code> type.
          */
         public EhcacheConsumerBuilder eventTypes(String eventTypes) {
             this.properties.put("eventTypes", eventTypes);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EjbEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EjbEndpointBuilder.java
index b7ff3a8..3a2519b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EjbEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EjbEndpointBuilder.java
@@ -93,8 +93,8 @@ public interface EjbEndpointBuilder {
         }
         /**
          * Used for configuring additional properties on the bean. The option is
-         * a <code>java.util.Map<java.lang.String, java.lang.Object></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T parameters(Map<String, Object> parameters) {
             this.properties.put("parameters", parameters);
@@ -102,8 +102,8 @@ public interface EjbEndpointBuilder {
         }
         /**
          * Used for configuring additional properties on the bean. The option
-         * will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * will be converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T parameters(String parameters) {
             this.properties.put("parameters", parameters);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ElsqlEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ElsqlEndpointBuilder.java
index 42af62d..abf8e4f 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ElsqlEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ElsqlEndpointBuilder.java
@@ -344,8 +344,8 @@ public interface ElsqlEndpointBuilder {
         }
         /**
          * Configures the Spring JdbcTemplate with the key/values from the Map.
-         * The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T templateOptions(Map<String, Object> templateOptions) {
             this.properties.put("templateOptions", templateOptions);
@@ -354,7 +354,8 @@ public interface ElsqlEndpointBuilder {
         /**
          * Configures the Spring JdbcTemplate with the key/values from the Map.
          * The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T templateOptions(String templateOptions) {
             this.properties.put("templateOptions", templateOptions);
@@ -847,7 +848,8 @@ public interface ElsqlEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public ElsqlConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -857,8 +859,8 @@ public interface ElsqlEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public ElsqlConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EtcdEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EtcdEndpointBuilder.java
index fa5b899..aaa11ba 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EtcdEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/EtcdEndpointBuilder.java
@@ -526,7 +526,8 @@ public interface EtcdEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public EtcdConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -536,8 +537,8 @@ public interface EtcdEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public EtcdConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FacebookEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FacebookEndpointBuilder.java
index 20738ac..2200447 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FacebookEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FacebookEndpointBuilder.java
@@ -236,7 +236,7 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * The domain names. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T domainNames(List<String> domainNames) {
             this.properties.put("domainNames", domainNames);
@@ -244,7 +244,7 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * The domain names. The option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T domainNames(String domainNames) {
             this.properties.put("domainNames", domainNames);
@@ -441,7 +441,7 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * The ids of users. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T ids(List<String> ids) {
             this.properties.put("ids", ids);
@@ -449,7 +449,7 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * The ids of users. The option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T ids(String ids) {
             this.properties.put("ids", ids);
@@ -763,8 +763,8 @@ public interface FacebookEndpointBuilder {
             return (T) this;
         }
         /**
-         * FQL queries. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * FQL queries. The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          */
         public T queries(Map<String, String> queries) {
             this.properties.put("queries", queries);
@@ -772,7 +772,8 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * FQL queries. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T queries(String queries) {
             this.properties.put("queries", queries);
@@ -811,8 +812,8 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * To configure Reading using key/value pairs from the Map. The option
-         * is a <code>java.util.Map<java.lang.String, java.lang.Object></code>
-         * type.
+         * is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T readingOptions(Map<String, Object> readingOptions) {
             this.properties.put("readingOptions", readingOptions);
@@ -820,8 +821,8 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * To configure Reading using key/value pairs from the Map. The option
-         * will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * will be converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T readingOptions(String readingOptions) {
             this.properties.put("readingOptions", readingOptions);
@@ -968,7 +969,7 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * The IDs of the users to tag. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T toUserIds(List<String> toUserIds) {
             this.properties.put("toUserIds", toUserIds);
@@ -976,7 +977,7 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * The IDs of the users to tag. The option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T toUserIds(String toUserIds) {
             this.properties.put("toUserIds", toUserIds);
@@ -1008,7 +1009,7 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * The IDs of users to invite to event. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T userIds(List<String> userIds) {
             this.properties.put("userIds", userIds);
@@ -1016,7 +1017,7 @@ public interface FacebookEndpointBuilder {
         }
         /**
          * The IDs of users to invite to event. The option will be converted to
-         * a <code>java.util.List<java.lang.String></code> type.
+         * a <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T userIds(String userIds) {
             this.properties.put("userIds", userIds);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FileEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FileEndpointBuilder.java
index a0a26bd..73c589b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FileEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FileEndpointBuilder.java
@@ -622,7 +622,7 @@ public interface FileEndpointBuilder {
          * used when special conditions must be met before a file can be
          * consumed, such as a special ready file exists. If this option is set
          * then the readLock option does not apply. The option is a
-         * <code>org.apache.camel.component.file.GenericFileProcessStrategy<java.io.File></code> type.
+         * <code>org.apache.camel.component.file.GenericFileProcessStrategy&lt;java.io.File&gt;</code> type.
          */
         public FileConsumerBuilder processStrategy(Object processStrategy) {
             this.properties.put("processStrategy", processStrategy);
@@ -636,7 +636,7 @@ public interface FileEndpointBuilder {
          * consumed, such as a special ready file exists. If this option is set
          * then the readLock option does not apply. The option will be converted
          * to a
-         * <code>org.apache.camel.component.file.GenericFileProcessStrategy<java.io.File></code> type.
+         * <code>org.apache.camel.component.file.GenericFileProcessStrategy&lt;java.io.File&gt;</code> type.
          */
         public FileConsumerBuilder processStrategy(String processStrategy) {
             this.properties.put("processStrategy", processStrategy);
@@ -773,7 +773,7 @@ public interface FileEndpointBuilder {
          * Pluggable filter as a
          * org.apache.camel.component.file.GenericFileFilter class. Will skip
          * files if filter returns false in its accept() method. The option is a
-         * <code>org.apache.camel.component.file.GenericFileFilter<java.io.File></code> type.
+         * <code>org.apache.camel.component.file.GenericFileFilter&lt;java.io.File&gt;</code> type.
          */
         public FileConsumerBuilder filter(Object filter) {
             this.properties.put("filter", filter);
@@ -784,7 +784,7 @@ public interface FileEndpointBuilder {
          * org.apache.camel.component.file.GenericFileFilter class. Will skip
          * files if filter returns false in its accept() method. The option will
          * be converted to a
-         * <code>org.apache.camel.component.file.GenericFileFilter<java.io.File></code> type.
+         * <code>org.apache.camel.component.file.GenericFileFilter&lt;java.io.File&gt;</code> type.
          */
         public FileConsumerBuilder filter(String filter) {
             this.properties.put("filter", filter);
@@ -998,7 +998,7 @@ public interface FileEndpointBuilder {
          * Pluggable read-lock as a
          * org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
          * implementation. The option is a
-         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy<java.io.File></code> type.
+         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy&lt;java.io.File&gt;</code> type.
          */
         public FileConsumerBuilder exclusiveReadLockStrategy(
                 Object exclusiveReadLockStrategy) {
@@ -1009,7 +1009,7 @@ public interface FileEndpointBuilder {
          * Pluggable read-lock as a
          * org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
          * implementation. The option will be converted to a
-         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy<java.io.File></code> type.
+         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy&lt;java.io.File&gt;</code> type.
          */
         public FileConsumerBuilder exclusiveReadLockStrategy(
                 String exclusiveReadLockStrategy) {
@@ -1611,7 +1611,8 @@ public interface FileEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public FileConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -1621,8 +1622,8 @@ public interface FileEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public FileConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
@@ -1699,7 +1700,8 @@ public interface FileEndpointBuilder {
          * Built-in sort by using the File Language. Supports nested sorts, so
          * you can have a sort by file name and as a 2nd group sort by modified
          * date. The option is a
-         * <code>java.util.Comparator<org.apache.camel.Exchange></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
          */
         public FileConsumerBuilder sortBy(Comparator<Exchange> sortBy) {
             this.properties.put("sortBy", sortBy);
@@ -1709,7 +1711,8 @@ public interface FileEndpointBuilder {
          * Built-in sort by using the File Language. Supports nested sorts, so
          * you can have a sort by file name and as a 2nd group sort by modified
          * date. The option will be converted to a
-         * <code>java.util.Comparator<org.apache.camel.Exchange></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
          */
         public FileConsumerBuilder sortBy(String sortBy) {
             this.properties.put("sortBy", sortBy);
@@ -1717,7 +1720,7 @@ public interface FileEndpointBuilder {
         }
         /**
          * Pluggable sorter as a java.util.Comparator class. The option is a
-         * <code>java.util.Comparator<org.apache.camel.component.file.GenericFile<java.io.File>></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;java.io.File&gt;&gt;</code> type.
          */
         public FileConsumerBuilder sorter(Comparator<Object> sorter) {
             this.properties.put("sorter", sorter);
@@ -1726,7 +1729,7 @@ public interface FileEndpointBuilder {
         /**
          * Pluggable sorter as a java.util.Comparator class. The option will be
          * converted to a
-         * <code>java.util.Comparator<org.apache.camel.component.file.GenericFile<java.io.File>></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;java.io.File&gt;&gt;</code> type.
          */
         public FileConsumerBuilder sorter(String sorter) {
             this.properties.put("sorter", sorter);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FlatpackEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FlatpackEndpointBuilder.java
index b595ef0..cfb65de 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FlatpackEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FlatpackEndpointBuilder.java
@@ -515,7 +515,8 @@ public interface FlatpackEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public FlatpackConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -525,8 +526,8 @@ public interface FlatpackEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public FlatpackConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FtpEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FtpEndpointBuilder.java
index 2dcfc8a..3f8406c 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FtpEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FtpEndpointBuilder.java
@@ -439,7 +439,8 @@ public interface FtpEndpointBuilder {
         /**
          * Used by FtpComponent to provide additional parameters for the
          * FTPClientConfig. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientConfigParameters(
                 Map<String, Object> ftpClientConfigParameters) {
@@ -449,7 +450,8 @@ public interface FtpEndpointBuilder {
         /**
          * Used by FtpComponent to provide additional parameters for the
          * FTPClientConfig. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientConfigParameters(String ftpClientConfigParameters) {
             this.properties.put("ftpClientConfigParameters", ftpClientConfigParameters);
@@ -457,8 +459,8 @@ public interface FtpEndpointBuilder {
         }
         /**
          * Used by FtpComponent to provide additional parameters for the
-         * FTPClient. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * FTPClient. The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T ftpClientParameters(Map<String, Object> ftpClientParameters) {
             this.properties.put("ftpClientParameters", ftpClientParameters);
@@ -467,7 +469,8 @@ public interface FtpEndpointBuilder {
         /**
          * Used by FtpComponent to provide additional parameters for the
          * FTPClient. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientParameters(String ftpClientParameters) {
             this.properties.put("ftpClientParameters", ftpClientParameters);
@@ -1077,7 +1080,7 @@ public interface FtpEndpointBuilder {
          * used when special conditions must be met before a file can be
          * consumed, such as a special ready file exists. If this option is set
          * then the readLock option does not apply. The option is a
-         * <code>org.apache.camel.component.file.GenericFileProcessStrategy<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileProcessStrategy&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpConsumerBuilder processStrategy(Object processStrategy) {
             this.properties.put("processStrategy", processStrategy);
@@ -1091,7 +1094,7 @@ public interface FtpEndpointBuilder {
          * consumed, such as a special ready file exists. If this option is set
          * then the readLock option does not apply. The option will be converted
          * to a
-         * <code>org.apache.camel.component.file.GenericFileProcessStrategy<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileProcessStrategy&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpConsumerBuilder processStrategy(String processStrategy) {
             this.properties.put("processStrategy", processStrategy);
@@ -1222,7 +1225,7 @@ public interface FtpEndpointBuilder {
          * Pluggable filter as a
          * org.apache.camel.component.file.GenericFileFilter class. Will skip
          * files if filter returns false in its accept() method. The option is a
-         * <code>org.apache.camel.component.file.GenericFileFilter<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileFilter&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpConsumerBuilder filter(Object filter) {
             this.properties.put("filter", filter);
@@ -1233,7 +1236,7 @@ public interface FtpEndpointBuilder {
          * org.apache.camel.component.file.GenericFileFilter class. Will skip
          * files if filter returns false in its accept() method. The option will
          * be converted to a
-         * <code>org.apache.camel.component.file.GenericFileFilter<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileFilter&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpConsumerBuilder filter(String filter) {
             this.properties.put("filter", filter);
@@ -1447,7 +1450,7 @@ public interface FtpEndpointBuilder {
          * Pluggable read-lock as a
          * org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
          * implementation. The option is a
-         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpConsumerBuilder exclusiveReadLockStrategy(
                 Object exclusiveReadLockStrategy) {
@@ -1458,7 +1461,7 @@ public interface FtpEndpointBuilder {
          * Pluggable read-lock as a
          * org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
          * implementation. The option will be converted to a
-         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpConsumerBuilder exclusiveReadLockStrategy(
                 String exclusiveReadLockStrategy) {
@@ -1954,7 +1957,8 @@ public interface FtpEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public FtpConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -1964,8 +1968,8 @@ public interface FtpEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public FtpConsumerBuilder schedulerProperties(String schedulerProperties) {
             this.properties.put("schedulerProperties", schedulerProperties);
@@ -2041,7 +2045,8 @@ public interface FtpEndpointBuilder {
          * Built-in sort by using the File Language. Supports nested sorts, so
          * you can have a sort by file name and as a 2nd group sort by modified
          * date. The option is a
-         * <code>java.util.Comparator<org.apache.camel.Exchange></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
          */
         public FtpConsumerBuilder sortBy(Comparator<Exchange> sortBy) {
             this.properties.put("sortBy", sortBy);
@@ -2051,7 +2056,8 @@ public interface FtpEndpointBuilder {
          * Built-in sort by using the File Language. Supports nested sorts, so
          * you can have a sort by file name and as a 2nd group sort by modified
          * date. The option will be converted to a
-         * <code>java.util.Comparator<org.apache.camel.Exchange></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
          */
         public FtpConsumerBuilder sortBy(String sortBy) {
             this.properties.put("sortBy", sortBy);
@@ -2059,7 +2065,7 @@ public interface FtpEndpointBuilder {
         }
         /**
          * Pluggable sorter as a java.util.Comparator class. The option is a
-         * <code>java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.commons.net.ftp.FTPFile>></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.commons.net.ftp.FTPFile&gt;&gt;</code> type.
          */
         public FtpConsumerBuilder sorter(Comparator<Object> sorter) {
             this.properties.put("sorter", sorter);
@@ -2068,7 +2074,7 @@ public interface FtpEndpointBuilder {
         /**
          * Pluggable sorter as a java.util.Comparator class. The option will be
          * converted to a
-         * <code>java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.commons.net.ftp.FTPFile>></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.commons.net.ftp.FTPFile&gt;&gt;</code> type.
          */
         public FtpConsumerBuilder sorter(String sorter) {
             this.properties.put("sorter", sorter);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FtpsEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FtpsEndpointBuilder.java
index 351b5b6..265b00b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FtpsEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/FtpsEndpointBuilder.java
@@ -439,7 +439,8 @@ public interface FtpsEndpointBuilder {
         /**
          * Used by FtpComponent to provide additional parameters for the
          * FTPClientConfig. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientConfigParameters(
                 Map<String, Object> ftpClientConfigParameters) {
@@ -449,7 +450,8 @@ public interface FtpsEndpointBuilder {
         /**
          * Used by FtpComponent to provide additional parameters for the
          * FTPClientConfig. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientConfigParameters(String ftpClientConfigParameters) {
             this.properties.put("ftpClientConfigParameters", ftpClientConfigParameters);
@@ -457,8 +459,8 @@ public interface FtpsEndpointBuilder {
         }
         /**
          * Used by FtpComponent to provide additional parameters for the
-         * FTPClient. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * FTPClient. The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T ftpClientParameters(Map<String, Object> ftpClientParameters) {
             this.properties.put("ftpClientParameters", ftpClientParameters);
@@ -467,7 +469,8 @@ public interface FtpsEndpointBuilder {
         /**
          * Used by FtpComponent to provide additional parameters for the
          * FTPClient. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientParameters(String ftpClientParameters) {
             this.properties.put("ftpClientParameters", ftpClientParameters);
@@ -678,7 +681,8 @@ public interface FtpsEndpointBuilder {
         }
         /**
          * Set the key store parameters. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientKeyStoreParameters(
                 Map<String, Object> ftpClientKeyStoreParameters) {
@@ -687,7 +691,8 @@ public interface FtpsEndpointBuilder {
         }
         /**
          * Set the key store parameters. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientKeyStoreParameters(String ftpClientKeyStoreParameters) {
             this.properties.put("ftpClientKeyStoreParameters", ftpClientKeyStoreParameters);
@@ -695,7 +700,8 @@ public interface FtpsEndpointBuilder {
         }
         /**
          * Set the trust store parameters. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientTrustStoreParameters(
                 Map<String, Object> ftpClientTrustStoreParameters) {
@@ -704,7 +710,8 @@ public interface FtpsEndpointBuilder {
         }
         /**
          * Set the trust store parameters. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T ftpClientTrustStoreParameters(
                 String ftpClientTrustStoreParameters) {
@@ -1208,7 +1215,7 @@ public interface FtpsEndpointBuilder {
          * used when special conditions must be met before a file can be
          * consumed, such as a special ready file exists. If this option is set
          * then the readLock option does not apply. The option is a
-         * <code>org.apache.camel.component.file.GenericFileProcessStrategy<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileProcessStrategy&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpsConsumerBuilder processStrategy(Object processStrategy) {
             this.properties.put("processStrategy", processStrategy);
@@ -1222,7 +1229,7 @@ public interface FtpsEndpointBuilder {
          * consumed, such as a special ready file exists. If this option is set
          * then the readLock option does not apply. The option will be converted
          * to a
-         * <code>org.apache.camel.component.file.GenericFileProcessStrategy<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileProcessStrategy&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpsConsumerBuilder processStrategy(String processStrategy) {
             this.properties.put("processStrategy", processStrategy);
@@ -1353,7 +1360,7 @@ public interface FtpsEndpointBuilder {
          * Pluggable filter as a
          * org.apache.camel.component.file.GenericFileFilter class. Will skip
          * files if filter returns false in its accept() method. The option is a
-         * <code>org.apache.camel.component.file.GenericFileFilter<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileFilter&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpsConsumerBuilder filter(Object filter) {
             this.properties.put("filter", filter);
@@ -1364,7 +1371,7 @@ public interface FtpsEndpointBuilder {
          * org.apache.camel.component.file.GenericFileFilter class. Will skip
          * files if filter returns false in its accept() method. The option will
          * be converted to a
-         * <code>org.apache.camel.component.file.GenericFileFilter<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileFilter&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpsConsumerBuilder filter(String filter) {
             this.properties.put("filter", filter);
@@ -1578,7 +1585,7 @@ public interface FtpsEndpointBuilder {
          * Pluggable read-lock as a
          * org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
          * implementation. The option is a
-         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpsConsumerBuilder exclusiveReadLockStrategy(
                 Object exclusiveReadLockStrategy) {
@@ -1589,7 +1596,7 @@ public interface FtpsEndpointBuilder {
          * Pluggable read-lock as a
          * org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
          * implementation. The option will be converted to a
-         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy<org.apache.commons.net.ftp.FTPFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy&lt;org.apache.commons.net.ftp.FTPFile&gt;</code> type.
          */
         public FtpsConsumerBuilder exclusiveReadLockStrategy(
                 String exclusiveReadLockStrategy) {
@@ -2191,7 +2198,8 @@ public interface FtpsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public FtpsConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -2201,8 +2209,8 @@ public interface FtpsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public FtpsConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
@@ -2279,7 +2287,8 @@ public interface FtpsEndpointBuilder {
          * Built-in sort by using the File Language. Supports nested sorts, so
          * you can have a sort by file name and as a 2nd group sort by modified
          * date. The option is a
-         * <code>java.util.Comparator<org.apache.camel.Exchange></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
          */
         public FtpsConsumerBuilder sortBy(Comparator<Exchange> sortBy) {
             this.properties.put("sortBy", sortBy);
@@ -2289,7 +2298,8 @@ public interface FtpsEndpointBuilder {
          * Built-in sort by using the File Language. Supports nested sorts, so
          * you can have a sort by file name and as a 2nd group sort by modified
          * date. The option will be converted to a
-         * <code>java.util.Comparator<org.apache.camel.Exchange></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
          */
         public FtpsConsumerBuilder sortBy(String sortBy) {
             this.properties.put("sortBy", sortBy);
@@ -2297,7 +2307,7 @@ public interface FtpsEndpointBuilder {
         }
         /**
          * Pluggable sorter as a java.util.Comparator class. The option is a
-         * <code>java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.commons.net.ftp.FTPFile>></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.commons.net.ftp.FTPFile&gt;&gt;</code> type.
          */
         public FtpsConsumerBuilder sorter(Comparator<Object> sorter) {
             this.properties.put("sorter", sorter);
@@ -2306,7 +2316,7 @@ public interface FtpsEndpointBuilder {
         /**
          * Pluggable sorter as a java.util.Comparator class. The option will be
          * converted to a
-         * <code>java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.commons.net.ftp.FTPFile>></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.commons.net.ftp.FTPFile&gt;&gt;</code> type.
          */
         public FtpsConsumerBuilder sorter(String sorter) {
             this.properties.put("sorter", sorter);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleCalendarStreamEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleCalendarStreamEndpointBuilder.java
index f3570a7..ff047f1 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleCalendarStreamEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleCalendarStreamEndpointBuilder.java
@@ -166,7 +166,7 @@ public interface GoogleCalendarStreamEndpointBuilder {
          * Specifies the level of permissions you want a calendar application to
          * have to a user account. See
          * https://developers.google.com/calendar/auth for more info. The option
-         * is a <code>java.util.List<java.lang.String></code> type.
+         * is a <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T scopes(List<String> scopes) {
             this.properties.put("scopes", scopes);
@@ -176,8 +176,8 @@ public interface GoogleCalendarStreamEndpointBuilder {
          * Specifies the level of permissions you want a calendar application to
          * have to a user account. See
          * https://developers.google.com/calendar/auth for more info. The option
-         * will be converted to a <code>java.util.List<java.lang.String></code>
-         * type.
+         * will be converted to a
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T scopes(String scopes) {
             this.properties.put("scopes", scopes);
@@ -537,7 +537,8 @@ public interface GoogleCalendarStreamEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public GoogleCalendarStreamConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -547,8 +548,8 @@ public interface GoogleCalendarStreamEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public GoogleCalendarStreamConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleDriveEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleDriveEndpointBuilder.java
index 7d3b711..60be552 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleDriveEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleDriveEndpointBuilder.java
@@ -140,7 +140,7 @@ public interface GoogleDriveEndpointBuilder {
          * Specifies the level of permissions you want a drive application to
          * have to a user account. See
          * https://developers.google.com/drive/web/scopes for more info. The
-         * option is a <code>java.util.List<java.lang.String></code> type.
+         * option is a <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T scopes(List<String> scopes) {
             this.properties.put("scopes", scopes);
@@ -151,7 +151,7 @@ public interface GoogleDriveEndpointBuilder {
          * have to a user account. See
          * https://developers.google.com/drive/web/scopes for more info. The
          * option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T scopes(String scopes) {
             this.properties.put("scopes", scopes);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleMailStreamEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleMailStreamEndpointBuilder.java
index 005f4cd..65850f2 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleMailStreamEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleMailStreamEndpointBuilder.java
@@ -493,7 +493,8 @@ public interface GoogleMailStreamEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public GoogleMailStreamConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -503,8 +504,8 @@ public interface GoogleMailStreamEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public GoogleMailStreamConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleSheetsStreamEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleSheetsStreamEndpointBuilder.java
index 591c686..fa03dc3 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleSheetsStreamEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GoogleSheetsStreamEndpointBuilder.java
@@ -153,7 +153,7 @@ public interface GoogleSheetsStreamEndpointBuilder {
          * have to a user account. See
          * https://developers.google.com/identity/protocols/googlescopes for
          * more info. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T scopes(List<String> scopes) {
             this.properties.put("scopes", scopes);
@@ -164,7 +164,7 @@ public interface GoogleSheetsStreamEndpointBuilder {
          * have to a user account. See
          * https://developers.google.com/identity/protocols/googlescopes for
          * more info. The option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T scopes(String scopes) {
             this.properties.put("scopes", scopes);
@@ -539,7 +539,8 @@ public interface GoogleSheetsStreamEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public GoogleSheetsStreamConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -549,8 +550,8 @@ public interface GoogleSheetsStreamEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public GoogleSheetsStreamConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GuavaEventBusEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GuavaEventBusEndpointBuilder.java
index d53f71d..44b0a9d 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GuavaEventBusEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/GuavaEventBusEndpointBuilder.java
@@ -54,7 +54,7 @@ public interface GuavaEventBusEndpointBuilder {
          * setting it to the java.lang.Object i.e. the consumer will capture all
          * messages incoming to the event bus. This option cannot be used
          * together with listenerInterface option. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T eventClass(Class<Object> eventClass) {
             this.properties.put("eventClass", eventClass);
@@ -67,7 +67,7 @@ public interface GuavaEventBusEndpointBuilder {
          * setting it to the java.lang.Object i.e. the consumer will capture all
          * messages incoming to the event bus. This option cannot be used
          * together with listenerInterface option. The option will be converted
-         * to a <code>java.lang.Class<java.lang.Object></code> type.
+         * to a <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T eventClass(String eventClass) {
             this.properties.put("eventClass", eventClass);
@@ -79,7 +79,8 @@ public interface GuavaEventBusEndpointBuilder {
          * registered as the EventBus listener. Particularly useful when
          * creating multi-event listeners and for handling DeadEvent properly.
          * This option cannot be used together with eventClass option. The
-         * option is a <code>java.lang.Class<java.lang.Object></code> type.
+         * option is a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T listenerInterface(Class<Object> listenerInterface) {
             this.properties.put("listenerInterface", listenerInterface);
@@ -92,7 +93,7 @@ public interface GuavaEventBusEndpointBuilder {
          * creating multi-event listeners and for handling DeadEvent properly.
          * This option cannot be used together with eventClass option. The
          * option will be converted to a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T listenerInterface(String listenerInterface) {
             this.properties.put("listenerInterface", listenerInterface);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HBaseEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HBaseEndpointBuilder.java
index 7fbabcd..8eedd02 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HBaseEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HBaseEndpointBuilder.java
@@ -68,8 +68,7 @@ public interface HBaseEndpointBuilder {
         }
         /**
          * A list of filters to use. The option is a
-         * <code>java.util.List<org.apache.hadoop.hbase.filter.Filter></code>
-         * type.
+         * <code>java.util.List&lt;org.apache.hadoop.hbase.filter.Filter&gt;</code> type.
          */
         public T filters(List<Object> filters) {
             this.properties.put("filters", filters);
@@ -77,8 +76,7 @@ public interface HBaseEndpointBuilder {
         }
         /**
          * A list of filters to use. The option will be converted to a
-         * <code>java.util.List<org.apache.hadoop.hbase.filter.Filter></code>
-         * type.
+         * <code>java.util.List&lt;org.apache.hadoop.hbase.filter.Filter&gt;</code> type.
          */
         public T filters(String filters) {
             this.properties.put("filters", filters);
@@ -112,8 +110,8 @@ public interface HBaseEndpointBuilder {
          * number suffix for referring to more than one columns valueType - The
          * value type. Supports a number suffix for referring to more than one
          * columns. Supported operations: CamelHBaseGet, and CamelHBaseScan. The
-         * option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T rowMapping(Map<String, Object> rowMapping) {
             this.properties.put("rowMapping", rowMapping);
@@ -130,8 +128,9 @@ public interface HBaseEndpointBuilder {
          * number suffix for referring to more than one columns valueType - The
          * value type. Supports a number suffix for referring to more than one
          * columns. Supported operations: CamelHBaseGet, and CamelHBaseScan. The
-         * option will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T rowMapping(String rowMapping) {
             this.properties.put("rowMapping", rowMapping);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HdfsEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HdfsEndpointBuilder.java
index f0ca71b..cd447b7 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HdfsEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HdfsEndpointBuilder.java
@@ -684,7 +684,8 @@ public interface HdfsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public HdfsConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -694,8 +695,8 @@ public interface HdfsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public HdfsConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HipchatEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HipchatEndpointBuilder.java
index e3eaa98..22d544f 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HipchatEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HipchatEndpointBuilder.java
@@ -458,7 +458,8 @@ public interface HipchatEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public HipchatConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -468,8 +469,8 @@ public interface HipchatEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public HipchatConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HttpEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HttpEndpointBuilder.java
index 96611b2..13a2bd1 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HttpEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/HttpEndpointBuilder.java
@@ -282,8 +282,8 @@ public interface HttpEndpointBuilder {
         }
         /**
          * To configure the HttpClient using the key/values from the Map. The
-         * option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T httpClientOptions(Map<String, Object> httpClientOptions) {
             this.properties.put("httpClientOptions", httpClientOptions);
@@ -291,8 +291,9 @@ public interface HttpEndpointBuilder {
         }
         /**
          * To configure the HttpClient using the key/values from the Map. The
-         * option will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T httpClientOptions(String httpClientOptions) {
             this.properties.put("httpClientOptions", httpClientOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IgniteCacheEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IgniteCacheEndpointBuilder.java
index 63a179d..eb2e37d 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IgniteCacheEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IgniteCacheEndpointBuilder.java
@@ -237,7 +237,7 @@ public interface IgniteCacheEndpointBuilder {
         /**
          * The remote filter, only used by the Continuous Query Consumer. The
          * option is a
-         * <code>org.apache.ignite.cache.CacheEntryEventSerializableFilter<java.lang.Object, java.lang.Object></code> type.
+         * <code>org.apache.ignite.cache.CacheEntryEventSerializableFilter&lt;java.lang.Object, java.lang.Object&gt;</code> type.
          */
         public IgniteCacheConsumerBuilder remoteFilter(Object remoteFilter) {
             this.properties.put("remoteFilter", remoteFilter);
@@ -246,7 +246,7 @@ public interface IgniteCacheEndpointBuilder {
         /**
          * The remote filter, only used by the Continuous Query Consumer. The
          * option will be converted to a
-         * <code>org.apache.ignite.cache.CacheEntryEventSerializableFilter<java.lang.Object, java.lang.Object></code> type.
+         * <code>org.apache.ignite.cache.CacheEntryEventSerializableFilter&lt;java.lang.Object, java.lang.Object&gt;</code> type.
          */
         public IgniteCacheConsumerBuilder remoteFilter(String remoteFilter) {
             this.properties.put("remoteFilter", remoteFilter);
@@ -324,7 +324,7 @@ public interface IgniteCacheEndpointBuilder {
         /**
          * The Query to execute, only needed for operations that require it, and
          * for the Continuous Query Consumer. The option is a
-         * <code>org.apache.ignite.cache.query.Query<javax.cache.Cache$Entry<java.lang.Object, java.lang.Object>></code> type.
+         * <code>org.apache.ignite.cache.query.Query&lt;javax.cache.Cache$Entry&lt;java.lang.Object, java.lang.Object&gt;&gt;</code> type.
          */
         public IgniteCacheProducerBuilder query(Object query) {
             this.properties.put("query", query);
@@ -333,7 +333,7 @@ public interface IgniteCacheEndpointBuilder {
         /**
          * The Query to execute, only needed for operations that require it, and
          * for the Continuous Query Consumer. The option will be converted to a
-         * <code>org.apache.ignite.cache.query.Query<javax.cache.Cache$Entry<java.lang.Object, java.lang.Object>></code> type.
+         * <code>org.apache.ignite.cache.query.Query&lt;javax.cache.Cache$Entry&lt;java.lang.Object, java.lang.Object&gt;&gt;</code> type.
          */
         public IgniteCacheProducerBuilder query(String query) {
             this.properties.put("query", query);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IgniteEventsEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IgniteEventsEndpointBuilder.java
index ddf3249..0747ac0 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IgniteEventsEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IgniteEventsEndpointBuilder.java
@@ -185,7 +185,7 @@ public interface IgniteEventsEndpointBuilder {
         /**
          * The event IDs to subscribe to as a Set directly where the IDs are the
          * different constants in org.apache.ignite.events.EventType. The option
-         * is a <code>java.util.Set<java.lang.Integer></code> type.
+         * is a <code>java.util.Set&lt;java.lang.Integer&gt;</code> type.
          */
         public IgniteEventsConsumerBuilder events(Set<Integer> events) {
             this.properties.put("events", events);
@@ -194,8 +194,8 @@ public interface IgniteEventsEndpointBuilder {
         /**
          * The event IDs to subscribe to as a Set directly where the IDs are the
          * different constants in org.apache.ignite.events.EventType. The option
-         * will be converted to a <code>java.util.Set<java.lang.Integer></code>
-         * type.
+         * will be converted to a
+         * <code>java.util.Set&lt;java.lang.Integer&gt;</code> type.
          */
         public IgniteEventsConsumerBuilder events(String events) {
             this.properties.put("events", events);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/InfinispanEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/InfinispanEndpointBuilder.java
index aec7181..e7a3f3b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/InfinispanEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/InfinispanEndpointBuilder.java
@@ -136,8 +136,8 @@ public interface InfinispanEndpointBuilder {
         }
         /**
          * Implementation specific properties for the CacheManager. The option
-         * is a <code>java.util.Map<java.lang.String, java.lang.String></code>
-         * type.
+         * is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          */
         public T configurationProperties(
                 Map<String, String> configurationProperties) {
@@ -146,8 +146,8 @@ public interface InfinispanEndpointBuilder {
         }
         /**
          * Implementation specific properties for the CacheManager. The option
-         * will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * will be converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          */
         public T configurationProperties(String configurationProperties) {
             this.properties.put("configurationProperties", configurationProperties);
@@ -333,7 +333,7 @@ public interface InfinispanEndpointBuilder {
          * TRANSACTION_COMPLETED, TRANSACTION_REGISTERED,
          * CACHE_ENTRY_INVALIDATED, DATA_REHASHED, TOPOLOGY_CHANGED,
          * PARTITION_STATUS_CHANGED. The option is a
-         * <code>java.util.Set<java.lang.String></code> type.
+         * <code>java.util.Set&lt;java.lang.String&gt;</code> type.
          */
         public InfinispanConsumerBuilder eventTypes(Set<String> eventTypes) {
             this.properties.put("eventTypes", eventTypes);
@@ -348,7 +348,7 @@ public interface InfinispanEndpointBuilder {
          * TRANSACTION_COMPLETED, TRANSACTION_REGISTERED,
          * CACHE_ENTRY_INVALIDATED, DATA_REHASHED, TOPOLOGY_CHANGED,
          * PARTITION_STATUS_CHANGED. The option will be converted to a
-         * <code>java.util.Set<java.lang.String></code> type.
+         * <code>java.util.Set&lt;java.lang.String&gt;</code> type.
          */
         public InfinispanConsumerBuilder eventTypes(String eventTypes) {
             this.properties.put("eventTypes", eventTypes);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IronMQEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IronMQEndpointBuilder.java
index 64a41b5..42869ba 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IronMQEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/IronMQEndpointBuilder.java
@@ -550,7 +550,8 @@ public interface IronMQEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public IronMQConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -560,8 +561,8 @@ public interface IronMQEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public IronMQConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JBPMEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JBPMEndpointBuilder.java
index 27acc30..c561b76 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JBPMEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JBPMEndpointBuilder.java
@@ -343,7 +343,7 @@ public interface JBPMEndpointBuilder {
         }
         /**
          * The potentialOwners when nominateTask operation is performed. The
-         * option is a <code>java.util.List<java.lang.String></code> type.
+         * option is a <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T entities(List<String> entities) {
             this.properties.put("entities", entities);
@@ -352,7 +352,7 @@ public interface JBPMEndpointBuilder {
         /**
          * The potentialOwners when nominateTask operation is performed. The
          * option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T entities(String entities) {
             this.properties.put("entities", entities);
@@ -376,8 +376,8 @@ public interface JBPMEndpointBuilder {
         }
         /**
          * the variables that should be set for various operations. The option
-         * is a <code>java.util.Map<java.lang.String, java.lang.Object></code>
-         * type.
+         * is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T parameters(Map<String, Object> parameters) {
             this.properties.put("parameters", parameters);
@@ -385,8 +385,8 @@ public interface JBPMEndpointBuilder {
         }
         /**
          * the variables that should be set for various operations. The option
-         * will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * will be converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T parameters(String parameters) {
             this.properties.put("parameters", parameters);
@@ -412,7 +412,7 @@ public interface JBPMEndpointBuilder {
         }
         /**
          * The list of status to use when filtering tasks. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T statuses(List<String> statuses) {
             this.properties.put("statuses", statuses);
@@ -420,7 +420,8 @@ public interface JBPMEndpointBuilder {
         }
         /**
          * The list of status to use when filtering tasks. The option will be
-         * converted to a <code>java.util.List<java.lang.String></code> type.
+         * converted to a <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          */
         public T statuses(String statuses) {
             this.properties.put("statuses", statuses);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JCacheEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JCacheEndpointBuilder.java
index e19821b..37ae601 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JCacheEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JCacheEndpointBuilder.java
@@ -201,7 +201,7 @@ public interface JCacheEndpointBuilder {
         }
         /**
          * The CacheLoader factory. The option is a
-         * <code>javax.cache.configuration.Factory<javax.cache.integration.CacheLoader></code> type.
+         * <code>javax.cache.configuration.Factory&lt;javax.cache.integration.CacheLoader&gt;</code> type.
          */
         public T cacheLoaderFactory(Object cacheLoaderFactory) {
             this.properties.put("cacheLoaderFactory", cacheLoaderFactory);
@@ -209,7 +209,7 @@ public interface JCacheEndpointBuilder {
         }
         /**
          * The CacheLoader factory. The option will be converted to a
-         * <code>javax.cache.configuration.Factory<javax.cache.integration.CacheLoader></code> type.
+         * <code>javax.cache.configuration.Factory&lt;javax.cache.integration.CacheLoader&gt;</code> type.
          */
         public T cacheLoaderFactory(String cacheLoaderFactory) {
             this.properties.put("cacheLoaderFactory", cacheLoaderFactory);
@@ -217,7 +217,7 @@ public interface JCacheEndpointBuilder {
         }
         /**
          * The CacheWriter factory. The option is a
-         * <code>javax.cache.configuration.Factory<javax.cache.integration.CacheWriter></code> type.
+         * <code>javax.cache.configuration.Factory&lt;javax.cache.integration.CacheWriter&gt;</code> type.
          */
         public T cacheWriterFactory(Object cacheWriterFactory) {
             this.properties.put("cacheWriterFactory", cacheWriterFactory);
@@ -225,7 +225,7 @@ public interface JCacheEndpointBuilder {
         }
         /**
          * The CacheWriter factory. The option will be converted to a
-         * <code>javax.cache.configuration.Factory<javax.cache.integration.CacheWriter></code> type.
+         * <code>javax.cache.configuration.Factory&lt;javax.cache.integration.CacheWriter&gt;</code> type.
          */
         public T cacheWriterFactory(String cacheWriterFactory) {
             this.properties.put("cacheWriterFactory", cacheWriterFactory);
@@ -250,7 +250,7 @@ public interface JCacheEndpointBuilder {
         }
         /**
          * The ExpiryPolicy factory. The option is a
-         * <code>javax.cache.configuration.Factory<javax.cache.expiry.ExpiryPolicy></code> type.
+         * <code>javax.cache.configuration.Factory&lt;javax.cache.expiry.ExpiryPolicy&gt;</code> type.
          */
         public T expiryPolicyFactory(Object expiryPolicyFactory) {
             this.properties.put("expiryPolicyFactory", expiryPolicyFactory);
@@ -258,7 +258,7 @@ public interface JCacheEndpointBuilder {
         }
         /**
          * The ExpiryPolicy factory. The option will be converted to a
-         * <code>javax.cache.configuration.Factory<javax.cache.expiry.ExpiryPolicy></code> type.
+         * <code>javax.cache.configuration.Factory&lt;javax.cache.expiry.ExpiryPolicy&gt;</code> type.
          */
         public T expiryPolicyFactory(String expiryPolicyFactory) {
             this.properties.put("expiryPolicyFactory", expiryPolicyFactory);
@@ -323,7 +323,7 @@ public interface JCacheEndpointBuilder {
         /**
          * Events a consumer should filter. If using filteredEvents option, then
          * eventFilters one will be ignored. The option is a
-         * <code>java.util.List<javax.cache.event.EventType></code> type.
+         * <code>java.util.List&lt;javax.cache.event.EventType&gt;</code> type.
          */
         public JCacheConsumerBuilder filteredEvents(
                 List<EventType> filteredEvents) {
@@ -333,7 +333,7 @@ public interface JCacheEndpointBuilder {
         /**
          * Events a consumer should filter. If using filteredEvents option, then
          * eventFilters one will be ignored. The option will be converted to a
-         * <code>java.util.List<javax.cache.event.EventType></code> type.
+         * <code>java.util.List&lt;javax.cache.event.EventType&gt;</code> type.
          */
         public JCacheConsumerBuilder filteredEvents(String filteredEvents) {
             this.properties.put("filteredEvents", filteredEvents);
@@ -374,8 +374,7 @@ public interface JCacheEndpointBuilder {
         /**
          * The CacheEntryEventFilter. If using eventFilters option, then
          * filteredEvents one will be ignored. The option is a
-         * <code>java.util.List<javax.cache.event.CacheEntryEventFilter></code>
-         * type.
+         * <code>java.util.List&lt;javax.cache.event.CacheEntryEventFilter&gt;</code> type.
          */
         public JCacheConsumerBuilder eventFilters(List<Object> eventFilters) {
             this.properties.put("eventFilters", eventFilters);
@@ -384,8 +383,7 @@ public interface JCacheEndpointBuilder {
         /**
          * The CacheEntryEventFilter. If using eventFilters option, then
          * filteredEvents one will be ignored. The option will be converted to a
-         * <code>java.util.List<javax.cache.event.CacheEntryEventFilter></code>
-         * type.
+         * <code>java.util.List&lt;javax.cache.event.CacheEntryEventFilter&gt;</code> type.
          */
         public JCacheConsumerBuilder eventFilters(String eventFilters) {
             this.properties.put("eventFilters", eventFilters);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JMXEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JMXEndpointBuilder.java
index b59808e..5534678 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JMXEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JMXEndpointBuilder.java
@@ -184,7 +184,8 @@ public interface JMXEndpointBuilder {
         /**
          * Properties for the object name. These values will be used if the
          * objectName param is not set. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T objectProperties(Map<String, String> objectProperties) {
             this.properties.put("objectProperties", objectProperties);
@@ -193,7 +194,8 @@ public interface JMXEndpointBuilder {
         /**
          * Properties for the object name. These values will be used if the
          * objectName param is not set. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T objectProperties(String objectProperties) {
             this.properties.put("objectProperties", objectProperties);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JdbcEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JdbcEndpointBuilder.java
index 68b92d2..a18ade9 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JdbcEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JdbcEndpointBuilder.java
@@ -94,7 +94,8 @@ public interface JdbcEndpointBuilder {
         /**
          * Optional parameters to the java.sql.Statement. For example to set
          * maxRows, fetchSize etc. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T parameters(Map<String, Object> parameters) {
             this.properties.put("parameters", parameters);
@@ -103,7 +104,8 @@ public interface JdbcEndpointBuilder {
         /**
          * Optional parameters to the java.sql.Statement. For example to set
          * maxRows, fetchSize etc. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T parameters(String parameters) {
             this.properties.put("parameters", parameters);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JettyHttpEndpointBuilder9.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JettyHttpEndpointBuilder9.java
index a7c41a5..6603557 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JettyHttpEndpointBuilder9.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JettyHttpEndpointBuilder9.java
@@ -616,8 +616,8 @@ public interface JettyHttpEndpointBuilder9 {
         /**
          * Configuration of the filter init parameters. These parameters will be
          * applied to the filter list before starting the jetty server. The
-         * option is a <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          */
         public JettyHttpConsumerBuilder9 filterInitParameters(
                 Map<String, String> filterInitParameters) {
@@ -627,8 +627,9 @@ public interface JettyHttpEndpointBuilder9 {
         /**
          * Configuration of the filter init parameters. These parameters will be
          * applied to the filter list before starting the jetty server. The
-         * option will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public JettyHttpConsumerBuilder9 filterInitParameters(
                 String filterInitParameters) {
@@ -638,7 +639,8 @@ public interface JettyHttpEndpointBuilder9 {
         /**
          * Allows using a custom filters which is putted into a list and can be
          * find in the Registry. Multiple values can be separated by comma. The
-         * option is a <code>java.util.List<javax.servlet.Filter></code> type.
+         * option is a <code>java.util.List&lt;javax.servlet.Filter&gt;</code>
+         * type.
          */
         public JettyHttpConsumerBuilder9 filtersRef(List<Object> filtersRef) {
             this.properties.put("filtersRef", filtersRef);
@@ -648,7 +650,7 @@ public interface JettyHttpEndpointBuilder9 {
          * Allows using a custom filters which is putted into a list and can be
          * find in the Registry. Multiple values can be separated by comma. The
          * option will be converted to a
-         * <code>java.util.List<javax.servlet.Filter></code> type.
+         * <code>java.util.List&lt;javax.servlet.Filter&gt;</code> type.
          */
         public JettyHttpConsumerBuilder9 filtersRef(String filtersRef) {
             this.properties.put("filtersRef", filtersRef);
@@ -661,7 +663,8 @@ public interface JettyHttpEndpointBuilder9 {
          * handlers with different Jetty endpoints using the same port number.
          * The handlers is associated to the port number. If you need different
          * handlers, then use different port numbers. The option is a
-         * <code>java.util.List<org.eclipse.jetty.server.Handler></code> type.
+         * <code>java.util.List&lt;org.eclipse.jetty.server.Handler&gt;</code>
+         * type.
          */
         public JettyHttpConsumerBuilder9 handlers(List<Object> handlers) {
             this.properties.put("handlers", handlers);
@@ -675,7 +678,8 @@ public interface JettyHttpEndpointBuilder9 {
          * The handlers is associated to the port number. If you need different
          * handlers, then use different port numbers. The option will be
          * converted to a
-         * <code>java.util.List<org.eclipse.jetty.server.Handler></code> type.
+         * <code>java.util.List&lt;org.eclipse.jetty.server.Handler&gt;</code>
+         * type.
          */
         public JettyHttpConsumerBuilder9 handlers(String handlers) {
             this.properties.put("handlers", handlers);
@@ -1033,7 +1037,8 @@ public interface JettyHttpEndpointBuilder9 {
          * httpClient.timeout=30000 sets the request timeout to 30 seconds, in
          * case you want to timeout sooner if you have long running
          * request/response calls. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public JettyHttpProducerBuilder9 httpClientParameters(
                 Map<String, Object> httpClientParameters) {
@@ -1046,7 +1051,8 @@ public interface JettyHttpEndpointBuilder9 {
          * httpClient.timeout=30000 sets the request timeout to 30 seconds, in
          * case you want to timeout sooner if you have long running
          * request/response calls. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public JettyHttpProducerBuilder9 httpClientParameters(
                 String httpClientParameters) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JooqEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JooqEndpointBuilder.java
index 62080f7..459e50f 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JooqEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JooqEndpointBuilder.java
@@ -47,7 +47,7 @@ public interface JooqEndpointBuilder {
         }
         /**
          * JOOQ entity class. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T entityType(Class<Object> entityType) {
             this.properties.put("entityType", entityType);
@@ -55,7 +55,7 @@ public interface JooqEndpointBuilder {
         }
         /**
          * JOOQ entity class. The option will be converted to a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T entityType(String entityType) {
             this.properties.put("entityType", entityType);
@@ -419,7 +419,8 @@ public interface JooqEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public JooqConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -429,8 +430,8 @@ public interface JooqEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public JooqConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JpaEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JpaEndpointBuilder.java
index ba9cf62..3a634e7 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JpaEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/JpaEndpointBuilder.java
@@ -47,7 +47,7 @@ public interface JpaEndpointBuilder {
         }
         /**
          * The JPA annotated class to use as entity. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T entityType(Class<Object> entityType) {
             this.properties.put("entityType", entityType);
@@ -55,7 +55,8 @@ public interface JpaEndpointBuilder {
         }
         /**
          * The JPA annotated class to use as entity. The option will be
-         * converted to a <code>java.lang.Class<java.lang.Object></code> type.
+         * converted to a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T entityType(String entityType) {
             this.properties.put("entityType", entityType);
@@ -125,7 +126,8 @@ public interface JpaEndpointBuilder {
          * it's used for producer, Simple expression can be used as a parameter
          * value. It allows you to retrieve parameter values from the message
          * body, header and etc. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T parameters(Map<String, Object> parameters) {
             this.properties.put("parameters", parameters);
@@ -139,7 +141,8 @@ public interface JpaEndpointBuilder {
          * it's used for producer, Simple expression can be used as a parameter
          * value. It allows you to retrieve parameter values from the message
          * body, header and etc. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T parameters(String parameters) {
             this.properties.put("parameters", parameters);
@@ -167,7 +170,7 @@ public interface JpaEndpointBuilder {
          * entityManager.createNativeQuery(nativeQuery)). Without this option,
          * we will return an object array. Only has an affect when using in
          * conjunction with native query when consuming data. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T resultClass(Class<Object> resultClass) {
             this.properties.put("resultClass", resultClass);
@@ -179,7 +182,8 @@ public interface JpaEndpointBuilder {
          * entityManager.createNativeQuery(nativeQuery)). Without this option,
          * we will return an object array. Only has an affect when using in
          * conjunction with native query when consuming data. The option will be
-         * converted to a <code>java.lang.Class<java.lang.Object></code> type.
+         * converted to a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T resultClass(String resultClass) {
             this.properties.put("resultClass", resultClass);
@@ -225,7 +229,8 @@ public interface JpaEndpointBuilder {
         }
         /**
          * Additional properties for the entity manager to use. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T entityManagerProperties(
                 Map<String, Object> entityManagerProperties) {
@@ -234,8 +239,8 @@ public interface JpaEndpointBuilder {
         }
         /**
          * Additional properties for the entity manager to use. The option will
-         * be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * be converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T entityManagerProperties(String entityManagerProperties) {
             this.properties.put("entityManagerProperties", entityManagerProperties);
@@ -333,7 +338,7 @@ public interface JpaEndpointBuilder {
         /**
          * To use a custom DeleteHandler to delete the row after the consumer is
          * done processing the exchange. The option is a
-         * <code>org.apache.camel.component.jpa.DeleteHandler<java.lang.Object></code> type.
+         * <code>org.apache.camel.component.jpa.DeleteHandler&lt;java.lang.Object&gt;</code> type.
          */
         public JpaConsumerBuilder deleteHandler(Object deleteHandler) {
             this.properties.put("deleteHandler", deleteHandler);
@@ -342,7 +347,7 @@ public interface JpaEndpointBuilder {
         /**
          * To use a custom DeleteHandler to delete the row after the consumer is
          * done processing the exchange. The option will be converted to a
-         * <code>org.apache.camel.component.jpa.DeleteHandler<java.lang.Object></code> type.
+         * <code>org.apache.camel.component.jpa.DeleteHandler&lt;java.lang.Object&gt;</code> type.
          */
         public JpaConsumerBuilder deleteHandler(String deleteHandler) {
             this.properties.put("deleteHandler", deleteHandler);
@@ -388,7 +393,7 @@ public interface JpaEndpointBuilder {
         /**
          * To use a custom Pre-DeleteHandler to delete the row after the
          * consumer has read the entity. The option is a
-         * <code>org.apache.camel.component.jpa.DeleteHandler<java.lang.Object></code> type.
+         * <code>org.apache.camel.component.jpa.DeleteHandler&lt;java.lang.Object&gt;</code> type.
          */
         public JpaConsumerBuilder preDeleteHandler(Object preDeleteHandler) {
             this.properties.put("preDeleteHandler", preDeleteHandler);
@@ -397,7 +402,7 @@ public interface JpaEndpointBuilder {
         /**
          * To use a custom Pre-DeleteHandler to delete the row after the
          * consumer has read the entity. The option will be converted to a
-         * <code>org.apache.camel.component.jpa.DeleteHandler<java.lang.Object></code> type.
+         * <code>org.apache.camel.component.jpa.DeleteHandler&lt;java.lang.Object&gt;</code> type.
          */
         public JpaConsumerBuilder preDeleteHandler(String preDeleteHandler) {
             this.properties.put("preDeleteHandler", preDeleteHandler);
@@ -712,7 +717,8 @@ public interface JpaEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public JpaConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -722,8 +728,8 @@ public interface JpaEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public JpaConsumerBuilder schedulerProperties(String schedulerProperties) {
             this.properties.put("schedulerProperties", schedulerProperties);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Jt400EndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Jt400EndpointBuilder.java
index 7767b94..528db7a 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Jt400EndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Jt400EndpointBuilder.java
@@ -605,7 +605,8 @@ public interface Jt400EndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public Jt400ConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -615,8 +616,8 @@ public interface Jt400EndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public Jt400ConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/KafkaEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/KafkaEndpointBuilder.java
index a2ecdf7..5cb777e 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/KafkaEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/KafkaEndpointBuilder.java
@@ -839,8 +839,8 @@ public interface KafkaEndpointBuilder {
          * The offset repository to use in order to locally store the offset of
          * each partition of the topic. Defining one will disable the
          * autocommit. The option is a
-         * <code>org.apache.camel.spi.StateRepository<java.lang.String,
-         * java.lang.String></code> type.
+         * <code>org.apache.camel.spi.StateRepository&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          */
         public KafkaConsumerBuilder offsetRepository(
                 StateRepository<String, String> offsetRepository) {
@@ -851,8 +851,8 @@ public interface KafkaEndpointBuilder {
          * The offset repository to use in order to locally store the offset of
          * each partition of the topic. Defining one will disable the
          * autocommit. The option will be converted to a
-         * <code>org.apache.camel.spi.StateRepository<java.lang.String,
-         * java.lang.String></code> type.
+         * <code>org.apache.camel.spi.StateRepository&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          */
         public KafkaConsumerBuilder offsetRepository(String offsetRepository) {
             this.properties.put("offsetRepository", offsetRepository);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/KinesisEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/KinesisEndpointBuilder.java
index 51f0232..f0b8f1f 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/KinesisEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/KinesisEndpointBuilder.java
@@ -548,7 +548,8 @@ public interface KinesisEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public KinesisConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -558,8 +559,8 @@ public interface KinesisEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public KinesisConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/LinkedInEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/LinkedInEndpointBuilder.java
index d65d16a..9c5fa11 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/LinkedInEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/LinkedInEndpointBuilder.java
@@ -128,7 +128,8 @@ public interface LinkedInEndpointBuilder {
         /**
          * Custom HTTP parameters, for example, proxy host and port. Use
          * constants from AllClientPNames. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T httpParams(Map<String, Object> httpParams) {
             this.properties.put("httpParams", httpParams);
@@ -137,7 +138,8 @@ public interface LinkedInEndpointBuilder {
         /**
          * Custom HTTP parameters, for example, proxy host and port. Use
          * constants from AllClientPNames. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T httpParams(String httpParams) {
             this.properties.put("httpParams", httpParams);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MailEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MailEndpointBuilder.java
index 10a4431..da01861 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MailEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MailEndpointBuilder.java
@@ -1073,7 +1073,8 @@ public interface MailEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public MailConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -1083,8 +1084,8 @@ public interface MailEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public MailConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MicrometerEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MicrometerEndpointBuilder.java
index f78626e..64eff64 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MicrometerEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MicrometerEndpointBuilder.java
@@ -62,8 +62,7 @@ public interface MicrometerEndpointBuilder {
         }
         /**
          * Tags of metrics. The option is a
-         * <code>java.lang.Iterable<io.micrometer.core.instrument.Tag></code>
-         * type.
+         * <code>java.lang.Iterable&lt;io.micrometer.core.instrument.Tag&gt;</code> type.
          */
         public T tags(Iterable<Object> tags) {
             this.properties.put("tags", tags);
@@ -71,8 +70,7 @@ public interface MicrometerEndpointBuilder {
         }
         /**
          * Tags of metrics. The option will be converted to a
-         * <code>java.lang.Iterable<io.micrometer.core.instrument.Tag></code>
-         * type.
+         * <code>java.lang.Iterable&lt;io.micrometer.core.instrument.Tag&gt;</code> type.
          */
         public T tags(String tags) {
             this.properties.put("tags", tags);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MiloClientEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MiloClientEndpointBuilder.java
index f1a2b40..1769a0b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MiloClientEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MiloClientEndpointBuilder.java
@@ -177,7 +177,7 @@ public interface MiloClientEndpointBuilder {
         /**
          * A set of allowed security policy URIs. Default is to accept all and
          * use the highest. The option is a
-         * <code>java.util.Set<java.lang.String></code> type.
+         * <code>java.util.Set&lt;java.lang.String&gt;</code> type.
          */
         public T allowedSecurityPolicies(Set<String> allowedSecurityPolicies) {
             this.properties.put("allowedSecurityPolicies", allowedSecurityPolicies);
@@ -186,7 +186,7 @@ public interface MiloClientEndpointBuilder {
         /**
          * A set of allowed security policy URIs. Default is to accept all and
          * use the highest. The option will be converted to a
-         * <code>java.util.Set<java.lang.String></code> type.
+         * <code>java.util.Set&lt;java.lang.String&gt;</code> type.
          */
         public T allowedSecurityPolicies(String allowedSecurityPolicies) {
             this.properties.put("allowedSecurityPolicies", allowedSecurityPolicies);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Mina2EndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Mina2EndpointBuilder.java
index db3e4f0..b13f31e 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Mina2EndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Mina2EndpointBuilder.java
@@ -344,7 +344,7 @@ public interface Mina2EndpointBuilder {
         }
         /**
          * You can set a list of Mina IoFilters to use. The option is a
-         * <code>java.util.List<org.apache.mina.core.filterchain.IoFilter></code> type.
+         * <code>java.util.List&lt;org.apache.mina.core.filterchain.IoFilter&gt;</code> type.
          */
         public T filters(List<Object> filters) {
             this.properties.put("filters", filters);
@@ -353,7 +353,7 @@ public interface Mina2EndpointBuilder {
         /**
          * You can set a list of Mina IoFilters to use. The option will be
          * converted to a
-         * <code>java.util.List<org.apache.mina.core.filterchain.IoFilter></code> type.
+         * <code>java.util.List&lt;org.apache.mina.core.filterchain.IoFilter&gt;</code> type.
          */
         public T filters(String filters) {
             this.properties.put("filters", filters);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MyBatisEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MyBatisEndpointBuilder.java
index c295e1e..3d8377f 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MyBatisEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/MyBatisEndpointBuilder.java
@@ -508,7 +508,8 @@ public interface MyBatisEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public MyBatisConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -518,8 +519,8 @@ public interface MyBatisEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public MyBatisConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/NettyEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/NettyEndpointBuilder.java
index f6bdee6..7756b25 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/NettyEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/NettyEndpointBuilder.java
@@ -290,7 +290,8 @@ public interface NettyEndpointBuilder {
          * For example option.child.keepAlive=false to set the netty option
          * child.keepAlive=false. See the Netty documentation for possible
          * options that can be used. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T options(Map<String, Object> options) {
             this.properties.put("options", options);
@@ -301,7 +302,8 @@ public interface NettyEndpointBuilder {
          * For example option.child.keepAlive=false to set the netty option
          * child.keepAlive=false. See the Netty documentation for possible
          * options that can be used. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T options(String options) {
             this.properties.put("options", options);
@@ -542,7 +544,8 @@ public interface NettyEndpointBuilder {
          * separated by comma, and have the values be looked up in the Registry.
          * Just remember to prefix the value with # so Camel knows it should
          * lookup. The option is a
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          */
         public T decoders(List<Object> decoders) {
             this.properties.put("decoders", decoders);
@@ -553,7 +556,8 @@ public interface NettyEndpointBuilder {
          * separated by comma, and have the values be looked up in the Registry.
          * Just remember to prefix the value with # so Camel knows it should
          * lookup. The option will be converted to a
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          */
         public T decoders(String decoders) {
             this.properties.put("decoders", decoders);
@@ -604,7 +608,8 @@ public interface NettyEndpointBuilder {
          * separated by comma, and have the values be looked up in the Registry.
          * Just remember to prefix the value with # so Camel knows it should
          * lookup. The option is a
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          */
         public T encoders(List<Object> encoders) {
             this.properties.put("encoders", encoders);
@@ -615,7 +620,8 @@ public interface NettyEndpointBuilder {
          * separated by comma, and have the values be looked up in the Registry.
          * Just remember to prefix the value with # so Camel knows it should
          * lookup. The option will be converted to a
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          */
         public T encoders(String encoders) {
             this.properties.put("encoders", encoders);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/NettyHttpEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/NettyHttpEndpointBuilder.java
index ceca605..d51a478 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/NettyHttpEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/NettyHttpEndpointBuilder.java
@@ -395,7 +395,8 @@ public interface NettyHttpEndpointBuilder {
          * For example option.child.keepAlive=false to set the netty option
          * child.keepAlive=false. See the Netty documentation for possible
          * options that can be used. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T options(Map<String, Object> options) {
             this.properties.put("options", options);
@@ -406,7 +407,8 @@ public interface NettyHttpEndpointBuilder {
          * For example option.child.keepAlive=false to set the netty option
          * child.keepAlive=false. See the Netty documentation for possible
          * options that can be used. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T options(String options) {
             this.properties.put("options", options);
@@ -587,7 +589,8 @@ public interface NettyHttpEndpointBuilder {
          * separated by comma, and have the values be looked up in the Registry.
          * Just remember to prefix the value with # so Camel knows it should
          * lookup. The option is a
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          */
         public T decoders(List<Object> decoders) {
             this.properties.put("decoders", decoders);
@@ -598,7 +601,8 @@ public interface NettyHttpEndpointBuilder {
          * separated by comma, and have the values be looked up in the Registry.
          * Just remember to prefix the value with # so Camel knows it should
          * lookup. The option will be converted to a
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          */
         public T decoders(String decoders) {
             this.properties.put("decoders", decoders);
@@ -629,7 +633,8 @@ public interface NettyHttpEndpointBuilder {
          * separated by comma, and have the values be looked up in the Registry.
          * Just remember to prefix the value with # so Camel knows it should
          * lookup. The option is a
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          */
         public T encoders(List<Object> encoders) {
             this.properties.put("encoders", encoders);
@@ -640,7 +645,8 @@ public interface NettyHttpEndpointBuilder {
          * separated by comma, and have the values be looked up in the Registry.
          * Just remember to prefix the value with # so Camel knows it should
          * lookup. The option will be converted to a
-         * <code>java.util.List<io.netty.channel.ChannelHandler></code> type.
+         * <code>java.util.List&lt;io.netty.channel.ChannelHandler&gt;</code>
+         * type.
          */
         public T encoders(String encoders) {
             this.properties.put("encoders", encoders);
@@ -1316,8 +1322,9 @@ public interface NettyHttpEndpointBuilder {
         }
         /**
          * To configure NettyHttpSecurityConfiguration using key/value pairs
-         * from the map. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * from the map. The option is a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public NettyHttpConsumerBuilder securityOptions(
                 Map<String, Object> securityOptions) {
@@ -1327,7 +1334,8 @@ public interface NettyHttpEndpointBuilder {
         /**
          * To configure NettyHttpSecurityConfiguration using key/value pairs
          * from the map. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public NettyHttpConsumerBuilder securityOptions(String securityOptions) {
             this.properties.put("securityOptions", securityOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Olingo2EndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Olingo2EndpointBuilder.java
index ed45107..771f8aa 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Olingo2EndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Olingo2EndpointBuilder.java
@@ -160,7 +160,8 @@ public interface Olingo2EndpointBuilder {
         /**
          * Custom HTTP headers to inject into every request, this could include
          * OAuth tokens, etc. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T httpHeaders(Map<String, String> httpHeaders) {
             this.properties.put("httpHeaders", httpHeaders);
@@ -169,7 +170,8 @@ public interface Olingo2EndpointBuilder {
         /**
          * Custom HTTP headers to inject into every request, this could include
          * OAuth tokens, etc. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T httpHeaders(String httpHeaders) {
             this.properties.put("httpHeaders", httpHeaders);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Olingo4EndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Olingo4EndpointBuilder.java
index bdc54ba..ed3ad70 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Olingo4EndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Olingo4EndpointBuilder.java
@@ -160,7 +160,8 @@ public interface Olingo4EndpointBuilder {
         /**
          * Custom HTTP headers to inject into every request, this could include
          * OAuth tokens, etc. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T httpHeaders(Map<String, String> httpHeaders) {
             this.properties.put("httpHeaders", httpHeaders);
@@ -169,7 +170,8 @@ public interface Olingo4EndpointBuilder {
         /**
          * Custom HTTP headers to inject into every request, this could include
          * OAuth tokens, etc. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T httpHeaders(String httpHeaders) {
             this.properties.put("httpHeaders", httpHeaders);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/PropertiesEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/PropertiesEndpointBuilder.java
index b5f528f..aa302af 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/PropertiesEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/PropertiesEndpointBuilder.java
@@ -69,7 +69,7 @@ public interface PropertiesEndpointBuilder {
          * A list of locations to load properties. You can use comma to separate
          * multiple locations. This option will override any default locations
          * and only use the locations from this option. The option is a
-         * <code>java.util.List<org.apache.camel.component.properties.PropertiesLocation></code> type.
+         * <code>java.util.List&lt;org.apache.camel.component.properties.PropertiesLocation&gt;</code> type.
          */
         public T locations(List<Object> locations) {
             this.properties.put("locations", locations);
@@ -80,7 +80,7 @@ public interface PropertiesEndpointBuilder {
          * multiple locations. This option will override any default locations
          * and only use the locations from this option. The option will be
          * converted to a
-         * <code>java.util.List<org.apache.camel.component.properties.PropertiesLocation></code> type.
+         * <code>java.util.List&lt;org.apache.camel.component.properties.PropertiesLocation&gt;</code> type.
          */
         public T locations(String locations) {
             this.properties.put("locations", locations);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/QuartzEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/QuartzEndpointBuilder.java
index c2110ea..eaf7b99 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/QuartzEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/QuartzEndpointBuilder.java
@@ -202,7 +202,8 @@ public interface QuartzEndpointBuilder {
         }
         /**
          * To configure additional options on the job. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T jobParameters(Map<String, Object> jobParameters) {
             this.properties.put("jobParameters", jobParameters);
@@ -210,8 +211,8 @@ public interface QuartzEndpointBuilder {
         }
         /**
          * To configure additional options on the job. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T jobParameters(String jobParameters) {
             this.properties.put("jobParameters", jobParameters);
@@ -253,7 +254,8 @@ public interface QuartzEndpointBuilder {
         }
         /**
          * To configure additional options on the trigger. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T triggerParameters(Map<String, Object> triggerParameters) {
             this.properties.put("triggerParameters", triggerParameters);
@@ -261,8 +263,8 @@ public interface QuartzEndpointBuilder {
         }
         /**
          * To configure additional options on the trigger. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T triggerParameters(String triggerParameters) {
             this.properties.put("triggerParameters", triggerParameters);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RabbitMQEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RabbitMQEndpointBuilder.java
index 7c0882f..5aae2dd 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RabbitMQEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RabbitMQEndpointBuilder.java
@@ -325,7 +325,7 @@ public interface RabbitMQEndpointBuilder {
          * different prefix is required for each: Exchange: arg.exchange. Queue:
          * arg.queue. Binding: arg.binding. For example to declare a queue with
          * message ttl argument:
-         * http://localhost:5672/exchange/queueargs=arg.queue.x-message-ttl=60000. The option is a <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * http://localhost:5672/exchange/queueargs=arg.queue.x-message-ttl=60000. The option is a <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code> type.
          */
         public T args(Map<String, Object> args) {
             this.properties.put("args", args);
@@ -336,7 +336,7 @@ public interface RabbitMQEndpointBuilder {
          * different prefix is required for each: Exchange: arg.exchange. Queue:
          * arg.queue. Binding: arg.binding. For example to declare a queue with
          * message ttl argument:
-         * http://localhost:5672/exchange/queueargs=arg.queue.x-message-ttl=60000. The option will be converted to a <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * http://localhost:5672/exchange/queueargs=arg.queue.x-message-ttl=60000. The option will be converted to a <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code> type.
          */
         public T args(String args) {
             this.properties.put("args", args);
@@ -382,8 +382,8 @@ public interface RabbitMQEndpointBuilder {
         }
         /**
          * Connection client properties (client info used in negotiating with
-         * the server). The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * the server). The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T clientProperties(Map<String, Object> clientProperties) {
             this.properties.put("clientProperties", clientProperties);
@@ -392,7 +392,8 @@ public interface RabbitMQEndpointBuilder {
         /**
          * Connection client properties (client info used in negotiating with
          * the server). The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T clientProperties(String clientProperties) {
             this.properties.put("clientProperties", clientProperties);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RestletEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RestletEndpointBuilder.java
index d97d923..a1a92f5 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RestletEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RestletEndpointBuilder.java
@@ -174,7 +174,8 @@ public interface RestletEndpointBuilder {
         }
         /**
          * To configure the security realms of restlet as a map. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T restletRealm(Map<String, String> restletRealm) {
             this.properties.put("restletRealm", restletRealm);
@@ -182,8 +183,8 @@ public interface RestletEndpointBuilder {
         }
         /**
          * To configure the security realms of restlet as a map. The option will
-         * be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * be converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.String&gt;</code> type.
          */
         public T restletRealm(String restletRealm) {
             this.properties.put("restletRealm", restletRealm);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RssEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RssEndpointBuilder.java
index 3a48a7a..fb09cf1 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RssEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/RssEndpointBuilder.java
@@ -516,7 +516,8 @@ public interface RssEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public RssConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -526,8 +527,8 @@ public interface RssEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public RssConsumerBuilder schedulerProperties(String schedulerProperties) {
             this.properties.put("schedulerProperties", schedulerProperties);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/S3EndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/S3EndpointBuilder.java
index b1982f8..ed8c531 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/S3EndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/S3EndpointBuilder.java
@@ -781,7 +781,8 @@ public interface S3EndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public S3ConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -791,8 +792,8 @@ public interface S3EndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public S3ConsumerBuilder schedulerProperties(String schedulerProperties) {
             this.properties.put("schedulerProperties", schedulerProperties);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SWFEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SWFEndpointBuilder.java
index c1ddc30..f6839e9 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SWFEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SWFEndpointBuilder.java
@@ -140,8 +140,8 @@ public interface SWFEndpointBuilder {
         }
         /**
          * To configure the ClientConfiguration using the key/values from the
-         * Map. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * Map. The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T clientConfigurationParameters(
                 Map<String, Object> clientConfigurationParameters) {
@@ -151,7 +151,8 @@ public interface SWFEndpointBuilder {
         /**
          * To configure the ClientConfiguration using the key/values from the
          * Map. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T clientConfigurationParameters(
                 String clientConfigurationParameters) {
@@ -160,8 +161,8 @@ public interface SWFEndpointBuilder {
         }
         /**
          * To configure the StartWorkflowOptions using the key/values from the
-         * Map. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * Map. The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T startWorkflowOptionsParameters(
                 Map<String, Object> startWorkflowOptionsParameters) {
@@ -171,7 +172,8 @@ public interface SWFEndpointBuilder {
         /**
          * To configure the StartWorkflowOptions using the key/values from the
          * Map. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T startWorkflowOptionsParameters(
                 String startWorkflowOptionsParameters) {
@@ -180,8 +182,8 @@ public interface SWFEndpointBuilder {
         }
         /**
          * To configure the AmazonSimpleWorkflowClient using the key/values from
-         * the Map. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * the Map. The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T sWClientParameters(Map<String, Object> sWClientParameters) {
             this.properties.put("sWClientParameters", sWClientParameters);
@@ -190,7 +192,8 @@ public interface SWFEndpointBuilder {
         /**
          * To configure the AmazonSimpleWorkflowClient using the key/values from
          * the Map. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T sWClientParameters(String sWClientParameters) {
             this.properties.put("sWClientParameters", sWClientParameters);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SalesforceEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SalesforceEndpointBuilder.java
index bba64f4..ee50c54 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SalesforceEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SalesforceEndpointBuilder.java
@@ -49,7 +49,8 @@ public interface SalesforceEndpointBuilder {
         }
         /**
          * Query params for APEX method. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T apexQueryParams(Map<String, Object> apexQueryParams) {
             this.properties.put("apexQueryParams", apexQueryParams);
@@ -57,7 +58,8 @@ public interface SalesforceEndpointBuilder {
         }
         /**
          * Query params for APEX method. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T apexQueryParams(String apexQueryParams) {
             this.properties.put("apexQueryParams", apexQueryParams);
@@ -194,7 +196,8 @@ public interface SalesforceEndpointBuilder {
         }
         /**
          * Replay IDs to start from per channel name. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Long></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Long&gt;</code>
+         * type.
          */
         public T initialReplayIdMap(Map<String, Long> initialReplayIdMap) {
             this.properties.put("initialReplayIdMap", initialReplayIdMap);
@@ -202,8 +205,8 @@ public interface SalesforceEndpointBuilder {
         }
         /**
          * Replay IDs to start from per channel name. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Long></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Long&gt;</code> type.
          */
         public T initialReplayIdMap(String initialReplayIdMap) {
             this.properties.put("initialReplayIdMap", initialReplayIdMap);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SchedulerEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SchedulerEndpointBuilder.java
index a9ede8f..66ac5e2 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SchedulerEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SchedulerEndpointBuilder.java
@@ -417,7 +417,8 @@ public interface SchedulerEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public SchedulerConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -427,8 +428,8 @@ public interface SchedulerEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public SchedulerConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ServiceNowEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ServiceNowEndpointBuilder.java
index 30916d5..ca3950b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ServiceNowEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/ServiceNowEndpointBuilder.java
@@ -238,8 +238,8 @@ public interface ServiceNowEndpointBuilder {
         }
         /**
          * Defines both request and response models. The option is a
-         * <code>java.util.Map<java.lang.String,
-         * java.lang.Class<java.lang.Object>></code> type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          */
         public T models(Map<String, Class<Object>> models) {
             this.properties.put("models", models);
@@ -247,8 +247,8 @@ public interface ServiceNowEndpointBuilder {
         }
         /**
          * Defines both request and response models. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Class<java.lang.Object>></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          */
         public T models(String models) {
             this.properties.put("models", models);
@@ -294,8 +294,8 @@ public interface ServiceNowEndpointBuilder {
         }
         /**
          * Defines the request model. The option is a
-         * <code>java.util.Map<java.lang.String,
-         * java.lang.Class<java.lang.Object>></code> type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          */
         public T requestModels(Map<String, Class<Object>> requestModels) {
             this.properties.put("requestModels", requestModels);
@@ -303,8 +303,8 @@ public interface ServiceNowEndpointBuilder {
         }
         /**
          * Defines the request model. The option will be converted to a
-         * <code>java.util.Map<java.lang.String,
-         * java.lang.Class<java.lang.Object>></code> type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          */
         public T requestModels(String requestModels) {
             this.properties.put("requestModels", requestModels);
@@ -321,8 +321,8 @@ public interface ServiceNowEndpointBuilder {
         }
         /**
          * Defines the response model. The option is a
-         * <code>java.util.Map<java.lang.String,
-         * java.lang.Class<java.lang.Object>></code> type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          */
         public T responseModels(Map<String, Class<Object>> responseModels) {
             this.properties.put("responseModels", responseModels);
@@ -330,8 +330,8 @@ public interface ServiceNowEndpointBuilder {
         }
         /**
          * Defines the response model. The option will be converted to a
-         * <code>java.util.Map<java.lang.String,
-         * java.lang.Class<java.lang.Object>></code> type.
+         * <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Class&lt;java.lang.Object&gt;&gt;</code> type.
          */
         public T responseModels(String responseModels) {
             this.properties.put("responseModels", responseModels);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SesEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SesEndpointBuilder.java
index d968b84..a304f80 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SesEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SesEndpointBuilder.java
@@ -97,7 +97,7 @@ public interface SesEndpointBuilder {
         /**
          * List of reply-to email address(es) for the message, override it using
          * 'CamelAwsSesReplyToAddresses' header. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T replyToAddresses(List<String> replyToAddresses) {
             this.properties.put("replyToAddresses", replyToAddresses);
@@ -106,7 +106,7 @@ public interface SesEndpointBuilder {
         /**
          * List of reply-to email address(es) for the message, override it using
          * 'CamelAwsSesReplyToAddresses' header. The option will be converted to
-         * a <code>java.util.List<java.lang.String></code> type.
+         * a <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T replyToAddresses(String replyToAddresses) {
             this.properties.put("replyToAddresses", replyToAddresses);
@@ -132,7 +132,7 @@ public interface SesEndpointBuilder {
         /**
          * List of destination email address. Can be overriden with
          * 'CamelAwsSesTo' header. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T to(List<String> to) {
             this.properties.put("to", to);
@@ -141,7 +141,7 @@ public interface SesEndpointBuilder {
         /**
          * List of destination email address. Can be overriden with
          * 'CamelAwsSesTo' header. The option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T to(String to) {
             this.properties.put("to", to);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SftpEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SftpEndpointBuilder.java
index 470c891..3839df5 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SftpEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SftpEndpointBuilder.java
@@ -1099,7 +1099,7 @@ public interface SftpEndpointBuilder {
          * used when special conditions must be met before a file can be
          * consumed, such as a special ready file exists. If this option is set
          * then the readLock option does not apply. The option is a
-         * <code>org.apache.camel.component.file.GenericFileProcessStrategy<org.apache.camel.component.file.remote.SftpRemoteFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileProcessStrategy&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;</code> type.
          */
         public SftpConsumerBuilder processStrategy(Object processStrategy) {
             this.properties.put("processStrategy", processStrategy);
@@ -1113,7 +1113,7 @@ public interface SftpEndpointBuilder {
          * consumed, such as a special ready file exists. If this option is set
          * then the readLock option does not apply. The option will be converted
          * to a
-         * <code>org.apache.camel.component.file.GenericFileProcessStrategy<org.apache.camel.component.file.remote.SftpRemoteFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileProcessStrategy&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;</code> type.
          */
         public SftpConsumerBuilder processStrategy(String processStrategy) {
             this.properties.put("processStrategy", processStrategy);
@@ -1228,7 +1228,7 @@ public interface SftpEndpointBuilder {
          * Pluggable filter as a
          * org.apache.camel.component.file.GenericFileFilter class. Will skip
          * files if filter returns false in its accept() method. The option is a
-         * <code>org.apache.camel.component.file.GenericFileFilter<org.apache.camel.component.file.remote.SftpRemoteFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileFilter&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;</code> type.
          */
         public SftpConsumerBuilder filter(Object filter) {
             this.properties.put("filter", filter);
@@ -1239,7 +1239,7 @@ public interface SftpEndpointBuilder {
          * org.apache.camel.component.file.GenericFileFilter class. Will skip
          * files if filter returns false in its accept() method. The option will
          * be converted to a
-         * <code>org.apache.camel.component.file.GenericFileFilter<org.apache.camel.component.file.remote.SftpRemoteFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileFilter&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;</code> type.
          */
         public SftpConsumerBuilder filter(String filter) {
             this.properties.put("filter", filter);
@@ -1453,7 +1453,7 @@ public interface SftpEndpointBuilder {
          * Pluggable read-lock as a
          * org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
          * implementation. The option is a
-         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy<org.apache.camel.component.file.remote.SftpRemoteFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;</code> type.
          */
         public SftpConsumerBuilder exclusiveReadLockStrategy(
                 Object exclusiveReadLockStrategy) {
@@ -1464,7 +1464,7 @@ public interface SftpEndpointBuilder {
          * Pluggable read-lock as a
          * org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy
          * implementation. The option will be converted to a
-         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy<org.apache.camel.component.file.remote.SftpRemoteFile></code> type.
+         * <code>org.apache.camel.component.file.GenericFileExclusiveReadLockStrategy&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;</code> type.
          */
         public SftpConsumerBuilder exclusiveReadLockStrategy(
                 String exclusiveReadLockStrategy) {
@@ -2066,7 +2066,8 @@ public interface SftpEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public SftpConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -2076,8 +2077,8 @@ public interface SftpEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public SftpConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
@@ -2154,7 +2155,8 @@ public interface SftpEndpointBuilder {
          * Built-in sort by using the File Language. Supports nested sorts, so
          * you can have a sort by file name and as a 2nd group sort by modified
          * date. The option is a
-         * <code>java.util.Comparator<org.apache.camel.Exchange></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
          */
         public SftpConsumerBuilder sortBy(Comparator<Exchange> sortBy) {
             this.properties.put("sortBy", sortBy);
@@ -2164,7 +2166,8 @@ public interface SftpEndpointBuilder {
          * Built-in sort by using the File Language. Supports nested sorts, so
          * you can have a sort by file name and as a 2nd group sort by modified
          * date. The option will be converted to a
-         * <code>java.util.Comparator<org.apache.camel.Exchange></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.Exchange&gt;</code>
+         * type.
          */
         public SftpConsumerBuilder sortBy(String sortBy) {
             this.properties.put("sortBy", sortBy);
@@ -2172,7 +2175,7 @@ public interface SftpEndpointBuilder {
         }
         /**
          * Pluggable sorter as a java.util.Comparator class. The option is a
-         * <code>java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.camel.component.file.remote.SftpRemoteFile>></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;&gt;</code> type.
          */
         public SftpConsumerBuilder sorter(Comparator<Object> sorter) {
             this.properties.put("sorter", sorter);
@@ -2181,7 +2184,7 @@ public interface SftpEndpointBuilder {
         /**
          * Pluggable sorter as a java.util.Comparator class. The option will be
          * converted to a
-         * <code>java.util.Comparator<org.apache.camel.component.file.GenericFile<org.apache.camel.component.file.remote.SftpRemoteFile>></code> type.
+         * <code>java.util.Comparator&lt;org.apache.camel.component.file.GenericFile&lt;org.apache.camel.component.file.remote.SftpRemoteFile&gt;&gt;</code> type.
          */
         public SftpConsumerBuilder sorter(String sorter) {
             this.properties.put("sorter", sorter);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SipEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SipEndpointBuilder.java
index 44046b1..cf11aeb 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SipEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SipEndpointBuilder.java
@@ -571,7 +571,7 @@ public interface SipEndpointBuilder {
          * Each ViaHeader containing a proxy address for request forwarding.
          * (Note this header is automatically updated by each proxy when the
          * request arrives at its listener). The option is a
-         * <code>java.util.List<javax.sip.header.ViaHeader></code> type.
+         * <code>java.util.List&lt;javax.sip.header.ViaHeader&gt;</code> type.
          */
         public T viaHeaders(List<Object> viaHeaders) {
             this.properties.put("viaHeaders", viaHeaders);
@@ -582,7 +582,7 @@ public interface SipEndpointBuilder {
          * Each ViaHeader containing a proxy address for request forwarding.
          * (Note this header is automatically updated by each proxy when the
          * request arrives at its listener). The option will be converted to a
-         * <code>java.util.List<javax.sip.header.ViaHeader></code> type.
+         * <code>java.util.List&lt;javax.sip.header.ViaHeader&gt;</code> type.
          */
         public T viaHeaders(String viaHeaders) {
             this.properties.put("viaHeaders", viaHeaders);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SlackEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SlackEndpointBuilder.java
index eb2450c..d5c6c31 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SlackEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SlackEndpointBuilder.java
@@ -420,7 +420,8 @@ public interface SlackEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public SlackConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -430,8 +431,8 @@ public interface SlackEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public SlackConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SmppEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SmppEndpointBuilder.java
index 7403908..3dfcb9f 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SmppEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SmppEndpointBuilder.java
@@ -351,8 +351,9 @@ public interface SmppEndpointBuilder {
         }
         /**
          * These headers will be passed to the proxy server while establishing
-         * the connection. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.String></code> type.
+         * the connection. The option is a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T proxyHeaders(Map<String, String> proxyHeaders) {
             this.properties.put("proxyHeaders", proxyHeaders);
@@ -361,7 +362,8 @@ public interface SmppEndpointBuilder {
         /**
          * These headers will be passed to the proxy server while establishing
          * the connection. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T proxyHeaders(String proxyHeaders) {
             this.properties.put("proxyHeaders", proxyHeaders);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SnmpEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SnmpEndpointBuilder.java
index caef232..b21caa3 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SnmpEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SnmpEndpointBuilder.java
@@ -629,7 +629,8 @@ public interface SnmpEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public SnmpConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -639,8 +640,8 @@ public interface SnmpEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public SnmpConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SplunkEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SplunkEndpointBuilder.java
index 4ffe0d2..4b8f6d9 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SplunkEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SplunkEndpointBuilder.java
@@ -582,7 +582,8 @@ public interface SplunkEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public SplunkConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -592,8 +593,8 @@ public interface SplunkEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public SplunkConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SqlEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SqlEndpointBuilder.java
index 09f4c70..3c90fc2 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SqlEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SqlEndpointBuilder.java
@@ -290,8 +290,8 @@ public interface SqlEndpointBuilder {
         }
         /**
          * Configures the Spring JdbcTemplate with the key/values from the Map.
-         * The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T templateOptions(Map<String, Object> templateOptions) {
             this.properties.put("templateOptions", templateOptions);
@@ -300,7 +300,8 @@ public interface SqlEndpointBuilder {
         /**
          * Configures the Spring JdbcTemplate with the key/values from the Map.
          * The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T templateOptions(String templateOptions) {
             this.properties.put("templateOptions", templateOptions);
@@ -789,7 +790,8 @@ public interface SqlEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public SqlConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -799,8 +801,8 @@ public interface SqlEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public SqlConsumerBuilder schedulerProperties(String schedulerProperties) {
             this.properties.put("schedulerProperties", schedulerProperties);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SqsEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SqsEndpointBuilder.java
index 39fbd36..022d11e 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SqsEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SqsEndpointBuilder.java
@@ -839,7 +839,8 @@ public interface SqsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public SqsConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -849,8 +850,8 @@ public interface SqsEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public SqsConsumerBuilder schedulerProperties(String schedulerProperties) {
             this.properties.put("schedulerProperties", schedulerProperties);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SshEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SshEndpointBuilder.java
index b57e8a2..0b384ae 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SshEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/SshEndpointBuilder.java
@@ -558,7 +558,8 @@ public interface SshEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public SshConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -568,8 +569,8 @@ public interface SshEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public SshConsumerBuilder schedulerProperties(String schedulerProperties) {
             this.properties.put("schedulerProperties", schedulerProperties);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/StreamEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/StreamEndpointBuilder.java
index c46feb3..3baa9e5 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/StreamEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/StreamEndpointBuilder.java
@@ -121,8 +121,8 @@ public interface StreamEndpointBuilder {
         }
         /**
          * Optional http headers to use in request when using HTTP URL. The
-         * option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T httpHeaders(Map<String, Object> httpHeaders) {
             this.properties.put("httpHeaders", httpHeaders);
@@ -130,8 +130,9 @@ public interface StreamEndpointBuilder {
         }
         /**
          * Optional http headers to use in request when using HTTP URL. The
-         * option will be converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * option will be converted to a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T httpHeaders(String httpHeaders) {
             this.properties.put("httpHeaders", httpHeaders);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TelegramEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TelegramEndpointBuilder.java
index b00dce6..71939f3 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TelegramEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TelegramEndpointBuilder.java
@@ -467,7 +467,8 @@ public interface TelegramEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public TelegramConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -477,8 +478,8 @@ public interface TelegramEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public TelegramConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterDirectMessageEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterDirectMessageEndpointBuilder.java
index d82bb11..6d29f33 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterDirectMessageEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterDirectMessageEndpointBuilder.java
@@ -709,7 +709,8 @@ public interface TwitterDirectMessageEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public TwitterDirectMessageConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -719,8 +720,8 @@ public interface TwitterDirectMessageEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public TwitterDirectMessageConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterSearchEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterSearchEndpointBuilder.java
index 5955455..2dc3ab0 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterSearchEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterSearchEndpointBuilder.java
@@ -698,7 +698,8 @@ public interface TwitterSearchEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public TwitterSearchConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -708,8 +709,8 @@ public interface TwitterSearchEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public TwitterSearchConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterStreamingEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterStreamingEndpointBuilder.java
index adeec45..87fce74 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterStreamingEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterStreamingEndpointBuilder.java
@@ -722,7 +722,8 @@ public interface TwitterStreamingEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public TwitterStreamingConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -732,8 +733,8 @@ public interface TwitterStreamingEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public TwitterStreamingConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterTimelineEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterTimelineEndpointBuilder.java
index 1618f99..e51267e 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterTimelineEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/TwitterTimelineEndpointBuilder.java
@@ -719,7 +719,8 @@ public interface TwitterTimelineEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public TwitterTimelineConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -729,8 +730,8 @@ public interface TwitterTimelineEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public TwitterTimelineConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/UndertowEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/UndertowEndpointBuilder.java
index c91a4ca..f0154f1 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/UndertowEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/UndertowEndpointBuilder.java
@@ -368,7 +368,8 @@ public interface UndertowEndpointBuilder {
          * defined in org.xnio.Options. To configure from endpoint uri, then
          * prefix each option with option., such as
          * option.close-abort=true&option.send-buffer=8192. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public UndertowProducerBuilder options(Map<String, Object> options) {
             this.properties.put("options", options);
@@ -379,8 +380,8 @@ public interface UndertowEndpointBuilder {
          * defined in org.xnio.Options. To configure from endpoint uri, then
          * prefix each option with option., such as
          * option.close-abort=true&option.send-buffer=8192. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public UndertowProducerBuilder options(String options) {
             this.properties.put("options", options);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WeatherEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WeatherEndpointBuilder.java
index f9d591d..8f5d0e2 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WeatherEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WeatherEndpointBuilder.java
@@ -223,8 +223,8 @@ public interface WeatherEndpointBuilder {
         }
         /**
          * List of id's of city/stations. You can separate multiple ids by
-         * comma. The option is a <code>java.util.List<java.lang.String></code>
-         * type.
+         * comma. The option is a
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T ids(List<String> ids) {
             this.properties.put("ids", ids);
@@ -233,7 +233,7 @@ public interface WeatherEndpointBuilder {
         /**
          * List of id's of city/stations. You can separate multiple ids by
          * comma. The option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T ids(String ids) {
             this.properties.put("ids", ids);
@@ -707,7 +707,8 @@ public interface WeatherEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public WeatherConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -717,8 +718,8 @@ public interface WeatherEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public WeatherConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Web3jEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Web3jEndpointBuilder.java
index 2ed5983..c522e76 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Web3jEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/Web3jEndpointBuilder.java
@@ -51,7 +51,7 @@ public interface Web3jEndpointBuilder {
         }
         /**
          * Contract address or a list of addresses. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T addresses(List<String> addresses) {
             this.properties.put("addresses", addresses);
@@ -59,7 +59,7 @@ public interface Web3jEndpointBuilder {
         }
         /**
          * Contract address or a list of addresses. The option will be converted
-         * to a <code>java.util.List<java.lang.String></code> type.
+         * to a <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T addresses(String addresses) {
             this.properties.put("addresses", addresses);
@@ -128,7 +128,8 @@ public interface Web3jEndpointBuilder {
         }
         /**
          * A transaction privateFor nodes with public keys in a Quorum network.
-         * The option is a <code>java.util.List<java.lang.String></code> type.
+         * The option is a <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          */
         public T privateFor(List<String> privateFor) {
             this.properties.put("privateFor", privateFor);
@@ -137,7 +138,7 @@ public interface Web3jEndpointBuilder {
         /**
          * A transaction privateFor nodes with public keys in a Quorum network.
          * The option will be converted to a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T privateFor(String privateFor) {
             this.properties.put("privateFor", privateFor);
@@ -189,7 +190,7 @@ public interface Web3jEndpointBuilder {
         /**
          * Topics are order-dependent. Each topic can also be a list of topics.
          * Specify multiple topics separated by comma. The option is a
-         * <code>java.util.List<java.lang.String></code> type.
+         * <code>java.util.List&lt;java.lang.String&gt;</code> type.
          */
         public T topics(List<String> topics) {
             this.properties.put("topics", topics);
@@ -198,7 +199,8 @@ public interface Web3jEndpointBuilder {
         /**
          * Topics are order-dependent. Each topic can also be a list of topics.
          * Specify multiple topics separated by comma. The option will be
-         * converted to a <code>java.util.List<java.lang.String></code> type.
+         * converted to a <code>java.util.List&lt;java.lang.String&gt;</code>
+         * type.
          */
         public T topics(String topics) {
             this.properties.put("topics", topics);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WordpressEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WordpressEndpointBuilder.java
index b2a0e5f..feb3220 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WordpressEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WordpressEndpointBuilder.java
@@ -66,7 +66,8 @@ public interface WordpressEndpointBuilder {
         }
         /**
          * The criteria to use with complex searches. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T criteria(Map<String, Object> criteria) {
             this.properties.put("criteria", criteria);
@@ -74,8 +75,8 @@ public interface WordpressEndpointBuilder {
         }
         /**
          * The criteria to use with complex searches. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T criteria(String criteria) {
             this.properties.put("criteria", criteria);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WsEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WsEndpointBuilder.java
index 082e116..5156983 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WsEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/WsEndpointBuilder.java
@@ -220,8 +220,8 @@ public interface WsEndpointBuilder {
         }
         /**
          * To configure the AsyncHttpClientConfig using the key/values from the
-         * Map. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * Map. The option is a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T clientConfigOptions(Map<String, Object> clientConfigOptions) {
             this.properties.put("clientConfigOptions", clientConfigOptions);
@@ -230,7 +230,8 @@ public interface WsEndpointBuilder {
         /**
          * To configure the AsyncHttpClientConfig using the key/values from the
          * Map. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T clientConfigOptions(String clientConfigOptions) {
             this.properties.put("clientConfigOptions", clientConfigOptions);
@@ -256,8 +257,9 @@ public interface WsEndpointBuilder {
         }
         /**
          * To configure the AsyncHttpClientConfig Realm using the key/values
-         * from the Map. The option is a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * from the Map. The option is a
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T clientConfigRealmOptions(
                 Map<String, Object> clientConfigRealmOptions) {
@@ -267,7 +269,8 @@ public interface WsEndpointBuilder {
         /**
          * To configure the AsyncHttpClientConfig Realm using the key/values
          * from the Map. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T clientConfigRealmOptions(String clientConfigRealmOptions) {
             this.properties.put("clientConfigRealmOptions", clientConfigRealmOptions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XQueryEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XQueryEndpointBuilder.java
index 73f02fd..22ebc8b 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XQueryEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XQueryEndpointBuilder.java
@@ -80,7 +80,8 @@ public interface XQueryEndpointBuilder {
         /**
          * Allows to control which namespace prefixes to use for a set of
          * namespace mappings. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T namespacePrefixes(Map<String, String> namespacePrefixes) {
             this.properties.put("namespacePrefixes", namespacePrefixes);
@@ -89,7 +90,8 @@ public interface XQueryEndpointBuilder {
         /**
          * Allows to control which namespace prefixes to use for a set of
          * namespace mappings. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.String></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.String&gt;</code>
+         * type.
          */
         public T namespacePrefixes(String namespacePrefixes) {
             this.properties.put("namespacePrefixes", namespacePrefixes);
@@ -113,7 +115,7 @@ public interface XQueryEndpointBuilder {
         }
         /**
          * What output result to use defined as a class. The option is a
-         * <code>java.lang.Class<java.lang.Object></code> type.
+         * <code>java.lang.Class&lt;java.lang.Object&gt;</code> type.
          */
         public T resultType(Class<Object> resultType) {
             this.properties.put("resultType", resultType);
@@ -121,7 +123,8 @@ public interface XQueryEndpointBuilder {
         }
         /**
          * What output result to use defined as a class. The option will be
-         * converted to a <code>java.lang.Class<java.lang.Object></code> type.
+         * converted to a <code>java.lang.Class&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T resultType(String resultType) {
             this.properties.put("resultType", resultType);
@@ -179,7 +182,8 @@ public interface XQueryEndpointBuilder {
         }
         /**
          * To set custom Saxon configuration properties. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T configurationProperties(
                 Map<String, Object> configurationProperties) {
@@ -188,8 +192,8 @@ public interface XQueryEndpointBuilder {
         }
         /**
          * To set custom Saxon configuration properties. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T configurationProperties(String configurationProperties) {
             this.properties.put("configurationProperties", configurationProperties);
@@ -213,7 +217,8 @@ public interface XQueryEndpointBuilder {
         }
         /**
          * Additional parameters. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T parameters(Map<String, Object> parameters) {
             this.properties.put("parameters", parameters);
@@ -221,7 +226,8 @@ public interface XQueryEndpointBuilder {
         }
         /**
          * Additional parameters. The option will be converted to a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T parameters(String parameters) {
             this.properties.put("parameters", parameters);
@@ -588,7 +594,8 @@ public interface XQueryEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public XQueryConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -598,8 +605,8 @@ public interface XQueryEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public XQueryConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XmlSignatureEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XmlSignatureEndpointBuilder.java
index 14e83de..47b2152 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XmlSignatureEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XmlSignatureEndpointBuilder.java
@@ -99,7 +99,8 @@ public interface XmlSignatureEndpointBuilder {
          * features off you must set the property value to Boolean#FALSE.
          * org.jcp.xml.dsig.validateManifests
          * javax.xml.crypto.dsig.cacheReference. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public T cryptoContextProperties(
                 Map<String, Object> cryptoContextProperties) {
@@ -115,8 +116,8 @@ public interface XmlSignatureEndpointBuilder {
          * features off you must set the property value to Boolean#FALSE.
          * org.jcp.xml.dsig.validateManifests
          * javax.xml.crypto.dsig.cacheReference. The option will be converted to
-         * a <code>java.util.Map<java.lang.String, java.lang.Object></code>
-         * type.
+         * a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public T cryptoContextProperties(String cryptoContextProperties) {
             this.properties.put("cryptoContextProperties", cryptoContextProperties);
@@ -512,7 +513,8 @@ public interface XmlSignatureEndpointBuilder {
          * http://www.w3.org/2000/09/xmldsig#enveloped-signature is added at
          * position 0 of the list. Use methods in XmlSignatureHelper to create
          * the transform methods. The option is a
-         * <code>java.util.List<javax.xml.crypto.AlgorithmMethod></code> type.
+         * <code>java.util.List&lt;javax.xml.crypto.AlgorithmMethod&gt;</code>
+         * type.
          */
         public T transformMethods(List<Object> transformMethods) {
             this.properties.put("transformMethods", transformMethods);
@@ -525,7 +527,8 @@ public interface XmlSignatureEndpointBuilder {
          * http://www.w3.org/2000/09/xmldsig#enveloped-signature is added at
          * position 0 of the list. Use methods in XmlSignatureHelper to create
          * the transform methods. The option will be converted to a
-         * <code>java.util.List<javax.xml.crypto.AlgorithmMethod></code> type.
+         * <code>java.util.List&lt;javax.xml.crypto.AlgorithmMethod&gt;</code>
+         * type.
          */
         public T transformMethods(String transformMethods) {
             this.properties.put("transformMethods", transformMethods);
@@ -544,7 +547,7 @@ public interface XmlSignatureEndpointBuilder {
          * setParentXpath(XPathFilterParameterSpec) for enveloped signature and
          * this parameter for detached signature must not be set in the same
          * configuration. The option is a
-         * <code>java.util.List<javax.xml.crypto.dsig.spec.XPathFilterParameterSpec></code> type.
+         * <code>java.util.List&lt;javax.xml.crypto.dsig.spec.XPathFilterParameterSpec&gt;</code> type.
          */
         public T xpathsToIdAttributes(List<Object> xpathsToIdAttributes) {
             this.properties.put("xpathsToIdAttributes", xpathsToIdAttributes);
@@ -563,7 +566,7 @@ public interface XmlSignatureEndpointBuilder {
          * setParentXpath(XPathFilterParameterSpec) for enveloped signature and
          * this parameter for detached signature must not be set in the same
          * configuration. The option will be converted to a
-         * <code>java.util.List<javax.xml.crypto.dsig.spec.XPathFilterParameterSpec></code> type.
+         * <code>java.util.List&lt;javax.xml.crypto.dsig.spec.XPathFilterParameterSpec&gt;</code> type.
          */
         public T xpathsToIdAttributes(String xpathsToIdAttributes) {
             this.properties.put("xpathsToIdAttributes", xpathsToIdAttributes);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XsltEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XsltEndpointBuilder.java
index 6fbb376..be33c92 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XsltEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/XsltEndpointBuilder.java
@@ -299,7 +299,8 @@ public interface XsltEndpointBuilder {
          * net.sf.saxon.lib.ExtensionFunctionDefinition. You would need to add
          * camel-saxon to the classpath. The function is looked up in the
          * registry, where you can comma to separate multiple values to lookup.
-         * The option is a <code>java.util.List<java.lang.Object></code> type.
+         * The option is a <code>java.util.List&lt;java.lang.Object&gt;</code>
+         * type.
          */
         public T saxonExtensionFunctions(List<Object> saxonExtensionFunctions) {
             this.properties.put("saxonExtensionFunctions", saxonExtensionFunctions);
@@ -311,7 +312,7 @@ public interface XsltEndpointBuilder {
          * camel-saxon to the classpath. The function is looked up in the
          * registry, where you can comma to separate multiple values to lookup.
          * The option will be converted to a
-         * <code>java.util.List<java.lang.Object></code> type.
+         * <code>java.util.List&lt;java.lang.Object&gt;</code> type.
          */
         public T saxonExtensionFunctions(String saxonExtensionFunctions) {
             this.properties.put("saxonExtensionFunctions", saxonExtensionFunctions);
diff --git a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/YammerEndpointBuilder.java b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/YammerEndpointBuilder.java
index d7fbd8d..a1d9d75 100644
--- a/core/camel-core/src/main/java/org/apache/camel/model/endpoint/YammerEndpointBuilder.java
+++ b/core/camel-core/src/main/java/org/apache/camel/model/endpoint/YammerEndpointBuilder.java
@@ -528,7 +528,8 @@ public interface YammerEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option is a
-         * <code>java.util.Map<java.lang.String, java.lang.Object></code> type.
+         * <code>java.util.Map&lt;java.lang.String, java.lang.Object&gt;</code>
+         * type.
          */
         public YammerConsumerBuilder schedulerProperties(
                 Map<String, Object> schedulerProperties) {
@@ -538,8 +539,8 @@ public interface YammerEndpointBuilder {
         /**
          * To configure additional properties when using a custom scheduler or
          * any of the Quartz2, Spring based scheduler. The option will be
-         * converted to a <code>java.util.Map<java.lang.String,
-         * java.lang.Object></code> type.
+         * converted to a <code>java.util.Map&lt;java.lang.String,
+         * java.lang.Object&gt;</code> type.
          */
         public YammerConsumerBuilder schedulerProperties(
                 String schedulerProperties) {
diff --git a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
index c604a3d..3a82a24 100644
--- a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
+++ b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/EndpointDslMojo.java
@@ -300,7 +300,9 @@ public class EndpointDslMojo extends AbstractMojo {
                 if (!desc.endsWith(".")) {
                     desc = desc + ".";
                 }
-                desc = desc + " The option is a <code>" + ogtype.toString() + "</code> type.";
+                desc = desc + " The option is a <code>" + ogtype.toString()
+                        .replaceAll("<", "&lt;")
+                        .replaceAll(">", "&gt;") + "</code> type.";
                 fluent.getJavaDoc().setFullText(desc);
             }
 
@@ -318,7 +320,9 @@ public class EndpointDslMojo extends AbstractMojo {
                     if (!desc.endsWith(".")) {
                         desc = desc + ".";
                     }
-                    desc = desc + " The option will be converted to a <code>" + ogtype.toString() + "</code> type.";
+                    desc = desc + " The option will be converted to a <code>" + ogtype.toString()
+                            .replaceAll("<", "&lt;")
+                            .replaceAll(">", "&gt;") + "</code> type.";
                     fluent.getJavaDoc().setFullText(desc);
                 }
             }