This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 311bcbb Regen
311bcbb is described below
commit 311bcbb9fbf559e16430f3235a531fd1d2cde71c
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Sep 9 16:53:19 2021 +0200
Regen
---
.../springboot/catalog/components/paho-mqtt5.json | 2 ++
.../src/main/docs/paho-mqtt5-starter.adoc | 5 ++---
.../springboot/PahoMqtt5ComponentConfiguration.java | 20 ++++++++++++++++++++
docs/modules/ROOT/pages/paho-mqtt5-starter.adoc | 5 ++---
tooling/camel-spring-boot-dependencies/pom.xml | 4 ++--
5 files changed, 28 insertions(+), 8 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/paho-mqtt5.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/paho-mqtt5.json
index a705292..c7b945c 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/paho-mqtt5.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/paho-mqtt5.json
@@ -36,6 +36,7 @@
"receiveMaximum": { "kind": "property", "displayName": "Receive Maximum",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 65535, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Receive
Maximum. This value represents the limit of QoS 1 and QoS 2 publications that
the clie [...]
"retained": { "kind": "property", "displayName": "Retained", "group":
"common", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Retain option" },
"serverURIs": { "kind": "property", "displayName": "Server URIs", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Set a list of one or
more serverURIs the client may connect to. Multiple servers can be separated by
comma. Each serverURI [...]
+ "sessionExpiryInterval": { "kind": "property", "displayName": "Session
Expiry Interval", "group": "common", "label": "", "required": false, "type":
"integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": -1, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Session Expiry
Interval. This value, measured in seconds, defines the maximum tim [...]
"willMqttProperties": { "kind": "property", "displayName": "Will Mqtt
Properties", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "org.eclipse.paho.mqttv5.common.packet.MqttProperties",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Last Will and
Testament (LWT) for the connection. In the eve [...]
"willPayload": { "kind": "property", "displayName": "Will Payload",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Last Will and
Testament (LWT) for the connection. In the event that this client unexpectedly
loses its connecti [...]
"willQos": { "kind": "property", "displayName": "Will Qos", "group":
"common", "label": "", "required": false, "type": "integer", "javaType": "int",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 1,
"configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Last Will and
Testament (LWT) for the connection. In the event that this client unexpectedly
loses its connectio [...]
@@ -69,6 +70,7 @@
"receiveMaximum": { "kind": "parameter", "displayName": "Receive Maximum",
"group": "common", "label": "", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 65535, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Receive
Maximum. This value represents the limit of QoS 1 and QoS 2 publications that
the cli [...]
"retained": { "kind": "parameter", "displayName": "Retained", "group":
"common", "label": "", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Retain option" },
"serverURIs": { "kind": "parameter", "displayName": "Server URIs",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Set a list of one or
more serverURIs the client may connect to. Multiple servers can be separated by
comma. Each serverUR [...]
+ "sessionExpiryInterval": { "kind": "parameter", "displayName": "Session
Expiry Interval", "group": "common", "label": "", "required": false, "type":
"integer", "javaType": "long", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": -1, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Session Expiry
Interval. This value, measured in seconds, defines the maximum ti [...]
"willMqttProperties": { "kind": "parameter", "displayName": "Will Mqtt
Properties", "group": "common", "label": "", "required": false, "type":
"object", "javaType": "org.eclipse.paho.mqttv5.common.packet.MqttProperties",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Last Will and
Testament (LWT) for the connection. In the ev [...]
"willPayload": { "kind": "parameter", "displayName": "Will Payload",
"group": "common", "label": "", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Last Will and
Testament (LWT) for the connection. In the event that this client unexpectedly
loses its connect [...]
"willQos": { "kind": "parameter", "displayName": "Will Qos", "group":
"common", "label": "", "required": false, "type": "integer", "javaType": "int",
"deprecated": false, "autowired": false, "secret": false, "defaultValue": 1,
"configurationClass":
"org.apache.camel.component.paho.mqtt5.PahoMqtt5Configuration",
"configurationField": "configuration", "description": "Sets the Last Will and
Testament (LWT) for the connection. In the event that this client unexpectedly
loses its connecti [...]
diff --git
a/components-starter/camel-paho-mqtt5-starter/src/main/docs/paho-mqtt5-starter.adoc
b/components-starter/camel-paho-mqtt5-starter/src/main/docs/paho-mqtt5-starter.adoc
index 1b23be3..8101780 100644
---
a/components-starter/camel-paho-mqtt5-starter/src/main/docs/paho-mqtt5-starter.adoc
+++
b/components-starter/camel-paho-mqtt5-starter/src/main/docs/paho-mqtt5-starter.adoc
@@ -17,7 +17,7 @@ When using paho-mqtt5 with Spring Boot make sure to use the
following Maven depe
----
-The component supports 32 options, which are listed below.
+The component supports 33 options, which are listed below.
@@ -47,6 +47,7 @@ The component supports 32 options, which are listed below.
| *camel.component.paho-mqtt5.receive-maximum* | Sets the Receive Maximum.
This value represents the limit of QoS 1 and QoS 2 publications that the client
is willing to process concurrently. There is no mechanism to limit the number
of QoS 0 publications that the Server might try to send. The default value is
65535 | 65535 | Integer
| *camel.component.paho-mqtt5.retained* | Retain option | false | Boolean
| *camel.component.paho-mqtt5.server-u-r-is* | Set a list of one or more
serverURIs the client may connect to. Multiple servers can be separated by
comma. Each serverURI specifies the address of a server that the client may
connect to. Two types of connection are supported tcp:// for a TCP connection
and ssl:// for a TCP connection secured by SSL/TLS. For example:
tcp://localhost:1883 ssl://localhost:8883 If the port is not specified, it will
default to 1883 for tcp:// URIs, and 8883 for [...]
+| *camel.component.paho-mqtt5.session-expiry-interval* | Sets the Session
Expiry Interval. This value, measured in seconds, defines the maximum time that
the broker will maintain the session for once the client disconnects. Clients
should only connect with a long Session Expiry interval if they intend to
connect to the server at some later point in time. By default this value is -1
and so will not be sent, in this case, the session will not expire. If a 0 is
sent, the session will end im [...]
| *camel.component.paho-mqtt5.socket-factory* | Sets the SocketFactory to use.
This allows an application to apply its own policies around the creation of
network sockets. If using an SSL connection, an SSLSocketFactory can be used to
supply application-specific security settings. The option is a
javax.net.SocketFactory type. | | SocketFactory
| *camel.component.paho-mqtt5.ssl-client-props* | Sets the SSL properties for
the connection. Note that these properties are only valid if an implementation
of the Java Secure Socket Extensions (JSSE) is available. These properties are
not used if a custom SocketFactory has been set. The following properties can
be used: com.ibm.ssl.protocol One of: SSL, SSLv3, TLS, TLSv1, SSL_TLS.
com.ibm.ssl.contextProvider Underlying JSSE provider. For example IBMJSSE2 or
SunJSSE com.ibm.ssl.keyStore [...]
| *camel.component.paho-mqtt5.ssl-hostname-verifier* | Sets the
HostnameVerifier for the SSL connection. Note that it will be used after
handshake on a connection and you should do actions by yourself when hostname
is verified error. There is no default HostnameVerifier. The option is a
javax.net.ssl.HostnameVerifier type. | | HostnameVerifier
@@ -57,6 +58,4 @@ The component supports 32 options, which are listed below.
| *camel.component.paho-mqtt5.will-retained* | Sets the Last Will and
Testament (LWT) for the connection. In the event that this client unexpectedly
loses its connection to the server, the server will publish a message to itself
using the supplied details. Whether or not the message should be retained. |
false | Boolean
| *camel.component.paho-mqtt5.will-topic* | Sets the Last Will and Testament
(LWT) for the connection. In the event that this client unexpectedly loses its
connection to the server, the server will publish a message to itself using the
supplied details. The topic to publish to. | | String
|===
-
-
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentConfiguration.java
b/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentConfiguration.java
index ed9f7a7..5b71d1a 100644
---
a/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentConfiguration.java
+++
b/components-starter/camel-paho-mqtt5-starter/src/main/java/org/apache/camel/component/paho/mqtt5/springboot/PahoMqtt5ComponentConfiguration.java
@@ -158,6 +158,18 @@ public class PahoMqtt5ComponentConfiguration
*/
private String serverURIs;
/**
+ * Sets the Session Expiry Interval. This value, measured in seconds,
+ * defines the maximum time that the broker will maintain the session for
+ * once the client disconnects. Clients should only connect with a long
+ * Session Expiry interval if they intend to connect to the server at some
+ * later point in time. By default this value is -1 and so will not be
sent,
+ * in this case, the session will not expire. If a 0 is sent, the session
+ * will end immediately once the Network Connection is closed. When the
+ * client has determined that it has no longer any use for the session, it
+ * should disconnect with a Session Expiry Interval set to 0.
+ */
+ private Long sessionExpiryInterval = -1L;
+ /**
* Sets the Last Will and Testament (LWT) for the connection. In the event
* that this client unexpectedly loses its connection to the server, the
* server will publish a message to itself using the supplied details. The
@@ -419,6 +431,14 @@ public class PahoMqtt5ComponentConfiguration
this.serverURIs = serverURIs;
}
+ public Long getSessionExpiryInterval() {
+ return sessionExpiryInterval;
+ }
+
+ public void setSessionExpiryInterval(Long sessionExpiryInterval) {
+ this.sessionExpiryInterval = sessionExpiryInterval;
+ }
+
public MqttProperties getWillMqttProperties() {
return willMqttProperties;
}
diff --git a/docs/modules/ROOT/pages/paho-mqtt5-starter.adoc
b/docs/modules/ROOT/pages/paho-mqtt5-starter.adoc
index 1b23be3..8101780 100644
--- a/docs/modules/ROOT/pages/paho-mqtt5-starter.adoc
+++ b/docs/modules/ROOT/pages/paho-mqtt5-starter.adoc
@@ -17,7 +17,7 @@ When using paho-mqtt5 with Spring Boot make sure to use the
following Maven depe
----
-The component supports 32 options, which are listed below.
+The component supports 33 options, which are listed below.
@@ -47,6 +47,7 @@ The component supports 32 options, which are listed below.
| *camel.component.paho-mqtt5.receive-maximum* | Sets the Receive Maximum.
This value represents the limit of QoS 1 and QoS 2 publications that the client
is willing to process concurrently. There is no mechanism to limit the number
of QoS 0 publications that the Server might try to send. The default value is
65535 | 65535 | Integer
| *camel.component.paho-mqtt5.retained* | Retain option | false | Boolean
| *camel.component.paho-mqtt5.server-u-r-is* | Set a list of one or more
serverURIs the client may connect to. Multiple servers can be separated by
comma. Each serverURI specifies the address of a server that the client may
connect to. Two types of connection are supported tcp:// for a TCP connection
and ssl:// for a TCP connection secured by SSL/TLS. For example:
tcp://localhost:1883 ssl://localhost:8883 If the port is not specified, it will
default to 1883 for tcp:// URIs, and 8883 for [...]
+| *camel.component.paho-mqtt5.session-expiry-interval* | Sets the Session
Expiry Interval. This value, measured in seconds, defines the maximum time that
the broker will maintain the session for once the client disconnects. Clients
should only connect with a long Session Expiry interval if they intend to
connect to the server at some later point in time. By default this value is -1
and so will not be sent, in this case, the session will not expire. If a 0 is
sent, the session will end im [...]
| *camel.component.paho-mqtt5.socket-factory* | Sets the SocketFactory to use.
This allows an application to apply its own policies around the creation of
network sockets. If using an SSL connection, an SSLSocketFactory can be used to
supply application-specific security settings. The option is a
javax.net.SocketFactory type. | | SocketFactory
| *camel.component.paho-mqtt5.ssl-client-props* | Sets the SSL properties for
the connection. Note that these properties are only valid if an implementation
of the Java Secure Socket Extensions (JSSE) is available. These properties are
not used if a custom SocketFactory has been set. The following properties can
be used: com.ibm.ssl.protocol One of: SSL, SSLv3, TLS, TLSv1, SSL_TLS.
com.ibm.ssl.contextProvider Underlying JSSE provider. For example IBMJSSE2 or
SunJSSE com.ibm.ssl.keyStore [...]
| *camel.component.paho-mqtt5.ssl-hostname-verifier* | Sets the
HostnameVerifier for the SSL connection. Note that it will be used after
handshake on a connection and you should do actions by yourself when hostname
is verified error. There is no default HostnameVerifier. The option is a
javax.net.ssl.HostnameVerifier type. | | HostnameVerifier
@@ -57,6 +58,4 @@ The component supports 32 options, which are listed below.
| *camel.component.paho-mqtt5.will-retained* | Sets the Last Will and
Testament (LWT) for the connection. In the event that this client unexpectedly
loses its connection to the server, the server will publish a message to itself
using the supplied details. Whether or not the message should be retained. |
false | Boolean
| *camel.component.paho-mqtt5.will-topic* | Sets the Last Will and Testament
(LWT) for the connection. In the event that this client unexpectedly loses its
connection to the server, the server will publish a message to itself using the
supplied details. The topic to publish to. | | String
|===
-
-
// spring-boot-auto-configure options: END
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 5094eda..1e163df 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4655,12 +4655,12 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-admin</artifactId>
- <version>2.8.0</version>
+ <version>2.8.1</version>
</dependency>
<dependency>
<groupId>org.apache.qpid</groupId>
