This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new dc28ef0 Regen
dc28ef0 is described below
commit dc28ef03a59c11289a703cac69f1f06d6c9e7139
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Oct 11 05:05:16 2019 +0200
Regen
---
docs/components/modules/ROOT/pages/paho-component.adoc | 16 ++++++++++------
.../camel-spring-boot-dependencies/pom.xml | 2 +-
2 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/paho-component.adoc
b/docs/components/modules/ROOT/pages/paho-component.adoc
index d163e91..84abda2 100644
--- a/docs/components/modules/ROOT/pages/paho-component.adoc
+++ b/docs/components/modules/ROOT/pages/paho-component.adoc
@@ -52,7 +52,7 @@ Where *topic* is the name of the topic.
== Options
// component options: START
-The Paho component supports 4 options, which are listed below.
+The Paho component supports 6 options, which are listed below.
@@ -61,6 +61,8 @@ The Paho component supports 4 options, which are listed below.
| Name | Description | Default | Type
| *brokerUrl* (common) | The URL of the MQTT broker. | | String
| *clientId* (common) | MQTT client identifier. | | String
+| *userName* (security) | Username to be used for authentication against the
MQTT broker | | String
+| *password* (security) | Password to be used for authentication against the
MQTT broker | | String
| *connectOptions* (advanced) | Client connection options | |
MqttConnectOptions
| *basicPropertyBinding* (advanced) | Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
|===
@@ -96,19 +98,19 @@ with the following path and query parameters:
| *brokerUrl* (common) | The URL of the MQTT broker. | tcp://localhost:1883 |
String
| *clientId* (common) | MQTT client identifier. | | String
| *connectOptions* (common) | Client connection options | | MqttConnectOptions
-| *filePersistenceDirectory* (common) | Base directory used by the file
persistence provider. | | String
-| *password* (common) | Password to be used for authentication against the
MQTT broker | | String
+| *filePersistenceDirectory* (common) | Base directory used by file
persistence. Will by default use user directory. | | String
| *persistence* (common) | Client persistence to be used - memory or file. |
MEMORY | PahoPersistence
| *qos* (common) | Client quality of service level (0-2). | 2 | int
-| *resolveMqttConnectOptions* (common) | Define if you don't want to resolve
the MQTT Connect Options from registry | true | boolean
| *retained* (common) | Retain option | false | boolean
-| *userName* (common) | Username to be used for authentication against the
MQTT broker | | String
| *bridgeErrorHandler* (consumer) | Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by the routing Error Handler. By default the
consumer will use the org.apache.camel.spi.ExceptionHandler to deal with
exceptions, that will be logged at WARN or ERROR level and ignored. | false |
boolean
| *exceptionHandler* (consumer) | To let the consumer use a custom
ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this
option is not in use. By default the consumer will deal with exceptions, that
will be logged at WARN or ERROR level and ignored. | | ExceptionHandler
| *exchangePattern* (consumer) | Sets the exchange pattern when the consumer
creates an exchange. | | ExchangePattern
| *lazyStartProducer* (producer) | Whether the producer should be started lazy
(on the first message). By starting lazy you can use this to allow CamelContext
and routes to startup in situations where a producer may otherwise fail during
starting and cause the route to fail being started. By deferring this startup
to be lazy then the startup failure can be handled during routing messages via
Camel's routing error handlers. Beware that when the first message is processed
then creating and [...]
| *basicPropertyBinding* (advanced) | Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities | false | boolean
+| *resolveMqttConnectOptions* (advanced) | Define if you don't want to resolve
the MQTT Connect Options from registry | true | boolean
| *synchronous* (advanced) | Sets whether synchronous processing should be
strictly used, or Camel is allowed to use asynchronous processing (if
supported). | false | boolean
+| *password* (security) | Password to be used for authentication against the
MQTT broker | | String
+| *userName* (security) | Username to be used for authentication against the
MQTT broker | | String
|===
// endpoint options: END
// spring-boot-auto-configure options: START
@@ -127,7 +129,7 @@ When using Spring Boot make sure to use the following Maven
dependency to have s
----
-The component supports 5 options, which are listed below.
+The component supports 7 options, which are listed below.
@@ -139,6 +141,8 @@ The component supports 5 options, which are listed below.
| *camel.component.paho.client-id* | MQTT client identifier. | | String
| *camel.component.paho.connect-options* | Client connection options. The
option is a org.eclipse.paho.client.mqttv3.MqttConnectOptions type. | | String
| *camel.component.paho.enabled* | Enable paho component | true | Boolean
+| *camel.component.paho.password* | Password to be used for authentication
against the MQTT broker | | String
+| *camel.component.paho.user-name* | Username to be used for authentication
against the MQTT broker | | String
|===
// spring-boot-auto-configure options: END
diff --git
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 637bd7b..6a7d3fc 100644
---
a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++
b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -73,7 +73,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>1.2.61</version>
+ <version>1.2.62</version>
</dependency>
<dependency>
<groupId>com.cloudbees.thirdparty</groupId>
