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-kamelets.git


The following commit(s) were added to refs/heads/main by this push:
     new 8faefcbc3 Fix #2890: remove mqtt-source and mqtt-sink, which use the 
deprecated paho component (#3260)
8faefcbc3 is described below

commit 8faefcbc3eed5f3375067feb53114c40a49d7e88
Author: Claus Ibsen <[email protected]>
AuthorDate: Thu Nov 19 15:04:43 2026 +0100

    Fix #2890: remove mqtt-source and mqtt-sink, which use the deprecated paho 
component (#3260)
    
    They are the MQTT 3.1.1 Kamelets, on camel-paho, which Camel has deprecated
    since 2.16. mqtt5-source and mqtt5-sink, on camel-paho-mqtt5, replace them 
for
    a broker that supports MQTT 5. The Kamelets overhaul of 4.24 removes them 
now
    instead of waiting for Camel to remove the component.
    
    Co-authored-by: Claude Opus 5.5 <[email protected]>
---
 .../camel-kamelets-catalog-sbom.json               |  32 +-----
 docs/modules/ROOT/nav.adoc                         |   2 -
 .../ROOT/partials/mqtt-sink-description.adoc       |  73 -------------
 .../ROOT/partials/mqtt-source-description.adoc     | 106 ------------------
 kamelets/mqtt-sink.kamelet.yaml                    | 112 -------------------
 kamelets/mqtt-source.kamelet.yaml                  | 120 ---------------------
 kamelets/mqtt5-sink.kamelet.yaml                   |   2 +-
 kamelets/mqtt5-source.kamelet.yaml                 |   2 +-
 .../catalog/model/KameletPrefixSchemeEnum.java     |   1 -
 .../kamelets/catalog/KameletsCatalogTest.java      |   2 -
 .../src/test/resources/remove-headers/kamelets.csv |   1 -
 .../main/resources/META-INF/kamelets-index.json    |  24 +----
 .../main/resources/kamelets/mqtt-sink.kamelet.yaml | 112 -------------------
 .../resources/kamelets/mqtt-source.kamelet.yaml    | 120 ---------------------
 .../resources/kamelets/mqtt5-sink.kamelet.yaml     |   2 +-
 .../resources/kamelets/mqtt5-source.kamelet.yaml   |   2 +-
 templates/pipes/camel-k/mqtt-sink-pipe.yaml        |  19 ----
 templates/pipes/camel-k/mqtt-source-pipe.yaml      |  19 ----
 templates/pipes/core/mqtt-sink-pipe.yaml           |  12 ---
 templates/pipes/core/mqtt-source-pipe.yaml         |   9 --
 20 files changed, 7 insertions(+), 765 deletions(-)

diff --git a/camel-kamelets-sbom/camel-kamelets-catalog-sbom.json 
b/camel-kamelets-sbom/camel-kamelets-catalog-sbom.json
index 43e99c973..7443fa99e 100644
--- a/camel-kamelets-sbom/camel-kamelets-catalog-sbom.json
+++ b/camel-kamelets-sbom/camel-kamelets-catalog-sbom.json
@@ -761,16 +761,6 @@
     "type" : "library",
     "name" : "mongodb-source",
     "version" : "4.24.0-SNAPSHOT"
-  }, {
-    "bom-ref" : "kamelet:mqtt-sink",
-    "type" : "library",
-    "name" : "mqtt-sink",
-    "version" : "4.24.0-SNAPSHOT"
-  }, {
-    "bom-ref" : "kamelet:mqtt-source",
-    "type" : "library",
-    "name" : "mqtt-source",
-    "version" : "4.24.0-SNAPSHOT"
   }, {
     "bom-ref" : "kamelet:mqtt5-sink",
     "type" : "library",
@@ -2012,17 +2002,6 @@
       "name" : "camel.apache.org/versioned-by",
       "value" : "runtime"
     } ]
-  }, {
-    "bom-ref" : "pkg:maven/org.apache.camel/[email protected]",
-    "type" : "library",
-    "group" : "org.apache.camel",
-    "name" : "camel-paho",
-    "version" : "4.24.0-SNAPSHOT",
-    "purl" : "pkg:maven/org.apache.camel/[email protected]",
-    "properties" : [ {
-      "name" : "camel.apache.org/versioned-by",
-      "value" : "runtime"
-    } ]
   }, {
     "bom-ref" : "pkg:maven/org.apache.camel/[email protected]",
     "type" : "library",
@@ -2307,7 +2286,7 @@
   } ],
   "dependencies" : [ {
     "ref" : "camel-kamelets-catalog",
-    "dependsOn" : [ "kamelet:avro-deserialize-action", 
"kamelet:avro-serialize-action", "kamelet:aws-bedrock-agent-runtime-sink", 
"kamelet:aws-bedrock-agent-sink", "kamelet:aws-bedrock-text-sink", 
"kamelet:aws-cloudtrail-source", "kamelet:aws-cloudwatch-sink", 
"kamelet:aws-comprehend-sink", "kamelet:aws-ddb-sink", 
"kamelet:aws-ddb-streams-source", "kamelet:aws-ec2-sink", 
"kamelet:aws-eventbridge-sink", "kamelet:aws-kinesis-firehose-sink", 
"kamelet:aws-kinesis-sink", "kamelet:aws-kinesis- [...]
+    "dependsOn" : [ "kamelet:avro-deserialize-action", 
"kamelet:avro-serialize-action", "kamelet:aws-bedrock-agent-runtime-sink", 
"kamelet:aws-bedrock-agent-sink", "kamelet:aws-bedrock-text-sink", 
"kamelet:aws-cloudtrail-source", "kamelet:aws-cloudwatch-sink", 
"kamelet:aws-comprehend-sink", "kamelet:aws-ddb-sink", 
"kamelet:aws-ddb-streams-source", "kamelet:aws-ec2-sink", 
"kamelet:aws-eventbridge-sink", "kamelet:aws-kinesis-firehose-sink", 
"kamelet:aws-kinesis-sink", "kamelet:aws-kinesis- [...]
   }, {
     "ref" : "kamelet:avro-deserialize-action",
     "dependsOn" : [ 
"pkg:maven/org.apache.camel/[email protected]", 
"pkg:maven/org.apache.camel/[email protected]" ]
@@ -2758,12 +2737,6 @@
   }, {
     "ref" : "kamelet:mongodb-source",
     "dependsOn" : [ 
"pkg:maven/org.apache.camel/[email protected]", 
"pkg:maven/org.apache.camel/[email protected]", 
"pkg:maven/org.apache.camel/[email protected]" ]
-  }, {
-    "ref" : "kamelet:mqtt-sink",
-    "dependsOn" : [ 
"pkg:maven/org.apache.camel/[email protected]", 
"pkg:maven/org.apache.camel/[email protected]" ]
-  }, {
-    "ref" : "kamelet:mqtt-source",
-    "dependsOn" : [ 
"pkg:maven/org.apache.camel/[email protected]", 
"pkg:maven/org.apache.camel/[email protected]" ]
   }, {
     "ref" : "kamelet:mqtt5-sink",
     "dependsOn" : [ 
"pkg:maven/org.apache.camel/[email protected]", 
"pkg:maven/org.apache.camel/[email protected]" ]
@@ -3223,9 +3196,6 @@
   }, {
     "ref" : "pkg:maven/org.apache.camel/[email protected]",
     "dependsOn" : [ ]
-  }, {
-    "ref" : "pkg:maven/org.apache.camel/[email protected]",
-    "dependsOn" : [ ]
   }, {
     "ref" : "pkg:maven/org.apache.camel/[email protected]",
     "dependsOn" : [ ]
diff --git a/docs/modules/ROOT/nav.adoc b/docs/modules/ROOT/nav.adoc
index e4b7f5251..3ce3bef3f 100644
--- a/docs/modules/ROOT/nav.adoc
+++ b/docs/modules/ROOT/nav.adoc
@@ -149,8 +149,6 @@
 * xref:mongodb-changes-stream-source.adoc[]
 * xref:mongodb-sink.adoc[]
 * xref:mongodb-source.adoc[]
-* xref:mqtt-sink.adoc[]
-* xref:mqtt-source.adoc[]
 * xref:mqtt5-sink.adoc[]
 * xref:mqtt5-source.adoc[]
 * xref:ms-exchange-online-imap-oauth-source.adoc[]
diff --git a/docs/modules/ROOT/partials/mqtt-sink-description.adoc 
b/docs/modules/ROOT/partials/mqtt-sink-description.adoc
deleted file mode 100644
index 306e049ba..000000000
--- a/docs/modules/ROOT/partials/mqtt-sink-description.adoc
+++ /dev/null
@@ -1,73 +0,0 @@
-== MQTT Sink Kamelet Description
-
-=== MQTT Protocol
-
-This Kamelet implements the MQTT (Message Queuing Telemetry Transport) 
protocol, a lightweight messaging protocol designed for IoT devices and 
applications with limited bandwidth or unreliable network connections.
-
-=== Broker Integration
-
-Connects to MQTT brokers using configurable broker URLs. Supports various MQTT 
brokers including Eclipse Mosquitto, HiveMQ, and cloud-based MQTT services.
-
-=== Publish-Subscribe Pattern
-
-Enables publish-subscribe messaging by sending messages to MQTT topics. This 
pattern allows for decoupled communication between message producers and 
consumers.
-
-=== Authentication
-
-Optional username and password authentication for secure broker connections. 
Suitable for both open and secured MQTT broker deployments.
-
-=== IoT and Mobile Applications
-
-MQTT's lightweight nature makes it ideal for:
-
-- IoT device communication
-- Mobile applications with limited bandwidth
-- Unreliable network scenarios
-- Battery-powered devices requiring minimal overhead
-
-=== Quality of Service
-
-MQTT supports different Quality of Service levels for message delivery 
guarantees. Set them with `qos`:
-
-- **QoS 0**: at most once, with no confirmation from the broker
-- **QoS 1**: at least once; a message can arrive twice
-- **QoS 2**: exactly once (used when `qos` is not set)
-
-A subscriber receives each message with the lower of this and the QoS it 
subscribed with.
-
-=== Retained Messages
-
-With `retained: true`, the broker keeps the last message of the topic and 
gives it to every client that subscribes to the topic later, for example the 
last known state of a device. Each retained message replaces the one before. 
When `retained` is not set, the broker does not keep the messages.
-
-=== TLS with a Private Certificate Authority
-
-With an `ssl://` address the Kamelet connects with TLS, checks the certificate 
and the host name of the broker, and trusts the certificate authorities that 
Java trusts by default. When the broker has a certificate from a private or 
self-signed authority, put the certificate of that authority in a trust store 
file (JKS or PKCS12) and set `sslTruststoreLocation` and 
`sslTruststorePassword`. The Kamelet then trusts the authorities in that file 
instead.
-
-[source,bash]
-----
-keytool -importcert -alias mqtt-ca -file ca.crt -keystore truststore.jks 
-storepass changeit
-----
-
-=== Example with QoS 1, Retained and TLS
-
-[source,yaml,subs='+attributes,macros']
-----
-- route:
-    from:
-      uri: "kamelet:timer-source"
-      parameters:
-        message: "online"
-        period: 60000
-      steps:
-        - to:
-            uri: "kamelet:mqtt-sink"
-            parameters:
-              topic: "devices/gateway-1/status"
-              brokerUrl: "ssl://mqtt.example.com:8883"
-              username: "mqttuser"
-              password: "mqttpass"
-              qos: 1
-              retained: true
-              sslTruststoreLocation: "/etc/mqtt/truststore.jks"
-              sslTruststorePassword: "changeit"
-----
\ No newline at end of file
diff --git a/docs/modules/ROOT/partials/mqtt-source-description.adoc 
b/docs/modules/ROOT/partials/mqtt-source-description.adoc
deleted file mode 100644
index fd96db440..000000000
--- a/docs/modules/ROOT/partials/mqtt-source-description.adoc
+++ /dev/null
@@ -1,106 +0,0 @@
-== MQTT Source Kamelet Description
-
-=== Authentication
-
-This Kamelet supports MQTT authentication using username and password 
credentials. It can also connect to MQTT brokers without authentication if not 
required.
-
-=== Configuration
-
-The MQTT Source Kamelet supports the following configurations:
-
-- **Topic**: MQTT topic to subscribe to, with the `+` and `#` wildcards 
(required)
-- **Broker URL**: MQTT broker URL (required, e.g., 
tcp://broker.example.com:1883, or ssl://broker.example.com:8883 for TLS)
-- **Username**: Username for MQTT authentication (optional)
-- **Password**: Password for MQTT authentication (optional)
-- **Client ID**: MQTT client identifier; a unique one is generated when it is 
not set. Two clients with the same ID push each other off the broker.
-- **Quality of Service** (`qos`): the highest QoS to receive messages with, 0, 
1 or 2; 2 when it is not set
-- **SSL Truststore Location** and **SSL Truststore Password**: a trust store 
file (JKS or PKCS12) with the certificate authority of the broker, for an 
`ssl://` broker with a certificate from a private or self-signed authority
-
-The Kamelet subscribes with a clean session, so it receives only the messages 
published while it is connected, plus, when it subscribes, the last retained 
message of each matching topic. It has no option to change the session.
-
-=== Output Format
-
-The Kamelet outputs the MQTT message payload as bytes, with the 
`CamelMqttTopic` and `CamelMqttQoS` headers.
-
-=== Usage Example
-
-[source,yaml,subs='+attributes,macros']
-----
-- route:
-    from:
-      uri: "kamelet:mqtt-source"
-      parameters:
-        topic: "sensors/temperature"
-        brokerUrl: "tcp://mqtt.example.com:1883"
-        username: "mqttuser"
-        password: "mqttpass"
-      steps:
-        - to:
-            uri: "kamelet:log-sink"
-----
-
-=== Example with a Wildcard and a Client ID
-
-[source,yaml,subs='+attributes,macros']
-----
-- route:
-    from:
-      uri: "kamelet:mqtt-source"
-      parameters:
-        topic: "critical/#"
-        brokerUrl: "tcp://mqtt.example.com:1883"
-        username: "mqttuser"
-        password: "mqttpass"
-        clientId: "camel-consumer-1"
-      steps:
-        - to:
-            uri: "kamelet:log-sink"
-----
-
-=== Example with SSL/TLS
-
-With an `ssl://` address the Kamelet connects with TLS, checks the certificate 
and the host name of the broker, and trusts the certificate authorities that 
Java trusts by default. When the broker has a certificate from a private or 
self-signed authority, put the certificate of that authority in a trust store 
file and set `sslTruststoreLocation` and `sslTruststorePassword`; the Kamelet 
then trusts the authorities in that file instead.
-
-[source,bash]
-----
-keytool -importcert -alias mqtt-ca -file ca.crt -keystore truststore.jks 
-storepass changeit
-----
-
-[source,yaml,subs='+attributes,macros']
-----
-- route:
-    from:
-      uri: "kamelet:mqtt-source"
-      parameters:
-        topic: "secure/data"
-        brokerUrl: "ssl://mqtt.example.com:8883"
-        username: "mqttuser"
-        password: "mqttpass"
-        sslTruststoreLocation: "/etc/mqtt/truststore.jks"
-        sslTruststorePassword: "changeit"
-      steps:
-        - to:
-            uri: "kamelet:log-sink"
-----
-
-=== Quality of Service Levels
-
-- **QoS 0**: At most once delivery (fire and forget)
-- **QoS 1**: At least once delivery (acknowledged delivery)
-- **QoS 2**: Exactly once delivery (assured delivery)
-
-The Kamelet subscribes with the QoS in `qos`, or 2 when it is not set; a 
message is received with the lower of that and the QoS it was published with. 
The `CamelMqttQoS` header tells which.
-
-[source,yaml,subs='+attributes,macros']
-----
-- route:
-    from:
-      uri: "kamelet:mqtt-source"
-      parameters:
-        topic: "sensors/#"
-        brokerUrl: "tcp://mqtt.example.com:1883"
-        qos: 1
-      steps:
-        - to:
-            uri: "kamelet:log-sink"
-----
diff --git a/kamelets/mqtt-sink.kamelet.yaml b/kamelets/mqtt-sink.kamelet.yaml
deleted file mode 100644
index de6b125ca..000000000
--- a/kamelets/mqtt-sink.kamelet.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Kamelet
-metadata:
-  name: mqtt-sink
-  annotations:
-    camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.24.0-SNAPSHOT"
-    camel.apache.org/kamelet.icon: 
"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjMuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMiIgYmFzZVByb2ZpbGU9InRpbnkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIKCSB5PSIwcHgiIHZpZXdCb3g9IjAgMCAzMjAgMzIwIiBvdmVyZmxvdz0idmlzaWJsZSIgeG1sOnNwYWNlPSJwcm
 [...]
-    camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/kamelet.group: "MQTT"
-    camel.apache.org/kamelet.namespace: "Messaging"
-  labels:
-    camel.apache.org/kamelet.type: "sink"
-spec:
-  definition:
-    title: "MQTT Sink"
-    description: |-
-      Publishes each message to a topic on an MQTT broker, such as Eclipse 
Mosquitto or HiveMQ, with MQTT 3.1.1.
-
-      Use it to send commands or data to IoT devices, or to publish readings 
and events for MQTT clients to receive. For a broker or clients that use MQTT 
5, use `mqtt5-sink`.
-
-      Input: the body is the payload, as text or bytes, and is sent as it is. 
A Map fails: turn it into JSON text first, for example with 
`json-serialize-action`. The headers of the message are not sent, as an MQTT 3 
message has none.
-
-      Output: the message is unchanged.
-
-      Good to know: messages are published with quality of service 2 (exactly 
once) unless `qos` is set, and the broker does not keep them for clients that 
subscribe later unless `retained` is true. It connects with no TLS unless 
`brokerUrl` starts with `ssl://`. With TLS it checks the certificate and the 
host name of the broker, and trusts the certificate authorities that Java 
trusts by default, or instead the ones in `sslTruststoreLocation`. It connects 
when the integration starts, and [...]
-    required:
-    - topic
-    - brokerUrl
-    type: object
-    properties:
-      topic:
-        title: "Topic"
-        description: "The topic to publish each message to, such as 
`sensors/temperature`. Wildcards (`+` and `#`) cannot be used here."
-        type: string
-        example: "sensors/temperature"
-      brokerUrl:
-        title: "Broker URL"
-        description: "The address of the MQTT broker, as `tcp://host:port` 
(usually port 1883), or `ssl://host:port` for TLS (usually port 8883). For a 
broker with a certificate from a private or self-signed authority, also set 
`sslTruststoreLocation`."
-        type: string
-        example: "tcp://mosquitto:1883"
-      username:
-        title: "Username"
-        description: "The user name to log in to the broker with. Leave it 
empty for a broker that accepts clients without a login."
-        type: string
-        x-descriptors:
-        - urn:camel:group:credentials
-      password:
-        title: "Password"
-        description: "The password to log in to the broker with, for the user 
`username`."
-        type: string
-        format: password
-        x-descriptors:
-        - urn:camel:group:credentials
-      qos:
-        title: "Quality of Service"
-        description: "The quality of service to publish each message with: 0 
(at most once, with no confirmation from the broker), 1 (at least once, a 
message can arrive twice) or 2 (exactly once). When it is not set, 2 is used. A 
subscriber receives the message with the lower of this and the quality of 
service it subscribed with."
-        type: integer
-        enum: [0, 1, 2]
-        example: 1
-      retained:
-        title: "Retained"
-        description: "Whether the broker keeps the message as the last one of 
the topic, and gives it to every client that subscribes to the topic later, 
such as the last known state of a device. Each retained message replaces the 
one before. When it is not set, messages are not retained."
-        type: boolean
-      sslTruststoreLocation:
-        title: "SSL Truststore Location"
-        description: "The path of a trust store file, in JKS or PKCS12 format, 
with the certificate of the authority that signed the certificate of the 
broker. Needed only with an `ssl://` address when the broker uses a certificate 
that Java does not trust by default, such as one from a private or self-signed 
authority. Not used with `tcp://`."
-        type: string
-        example: "/etc/mqtt/truststore.jks"
-      sslTruststorePassword:
-        title: "SSL Truststore Password"
-        description: "The password of the trust store file in 
`sslTruststoreLocation`."
-        type: string
-        format: password
-        x-descriptors:
-        - urn:camel:group:credentials
-  dependencies:
-    - "camel:paho"
-    - "camel:kamelet"
-  template:
-    from:
-      uri: kamelet:source
-      steps:
-        - removeHeaders:
-            pattern: CamelPaho*
-        - to:
-            uri: paho
-            parameters:
-              topic: "{{topic}}"
-              brokerUrl: "{{brokerUrl}}"
-              password: "RAW({{?password}})"
-              userName: "RAW({{?username}})"
-              qos: "{{?qos}}"
-              retained: "{{?retained}}"
-              "sslClientProps[com.ibm.ssl.trustStore]": 
"{{?sslTruststoreLocation}}"
-              "sslClientProps[com.ibm.ssl.trustStorePassword]": 
"RAW({{?sslTruststorePassword}})"
diff --git a/kamelets/mqtt-source.kamelet.yaml 
b/kamelets/mqtt-source.kamelet.yaml
deleted file mode 100644
index 969c68ac8..000000000
--- a/kamelets/mqtt-source.kamelet.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Kamelet
-metadata:
-  name: mqtt-source
-  annotations:
-    camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.24.0-SNAPSHOT"
-    camel.apache.org/kamelet.icon: 
"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjMuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMiIgYmFzZVByb2ZpbGU9InRpbnkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIKCSB5PSIwcHgiIHZpZXdCb3g9IjAgMCAzMjAgMzIwIiBvdmVyZmxvdz0idmlzaWJsZSIgeG1sOnNwYWNlPSJwcm
 [...]
-    camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/kamelet.group: "MQTT"
-    camel.apache.org/kamelet.namespace: "Messaging"
-  labels:
-    camel.apache.org/kamelet.type: "source"
-spec:
-  definition:
-    title: "MQTT Source"
-    description: |-
-      Receives each message published to a topic on an MQTT broker, such as 
Eclipse Mosquitto or HiveMQ, with MQTT 3.1.1.
-
-      Use it to collect readings and events from IoT devices and other MQTT 
clients. A topic with wildcards, such as `sensors/#`, receives from many topics 
at once. For a broker or clients that use MQTT 5, use `mqtt5-source`.
-
-      Output: the body is the payload, as bytes. The `CamelMqttTopic` header 
is the topic the message was published to, and `CamelMqttQoS` its quality of 
service.
-
-      Good to know: it receives only the messages published while it is 
connected, plus, when it subscribes, the last retained message of each matching 
topic. It subscribes with quality of service 2 (exactly once) unless `qos` is 
set. Each running copy needs its own `clientId`: two clients with the same ID 
keep pushing each other off the broker and lose messages. When it is not set, a 
unique one is generated. It connects with no TLS unless `brokerUrl` starts with 
`ssl://`. With TLS it ch [...]
-    required:
-    - topic
-    - brokerUrl
-    type: object
-    properties:
-      topic:
-        title: "Topic"
-        description: "The topic to subscribe to. `+` matches one level of the 
topic and `#` all the levels below, as in `sensors/+/temperature` or 
`sensors/#`."
-        type: string
-        example: "sensors/#"
-      brokerUrl:
-        title: "Broker URL"
-        description: "The address of the MQTT broker, as `tcp://host:port` 
(usually port 1883), or `ssl://host:port` for TLS (usually port 8883). For a 
broker with a certificate from a private or self-signed authority, also set 
`sslTruststoreLocation`."
-        type: string
-        example: "tcp://mosquitto:1883"
-      clientId:
-        title: "Client ID"
-        description: "The client ID that names this connection to the broker. 
It must be unique on the broker: a second client with the same ID pushes the 
first one off. When it is not set, a unique ID is generated."
-        example: "sensor-reader-1"
-        type: string
-      username:
-        title: "Username"
-        description: "The user name to log in to the broker with. Leave it 
empty for a broker that accepts clients without a login."
-        type: string
-        x-descriptors:
-        - urn:camel:group:credentials
-      password:
-        title: "Password"
-        description: "The password to log in to the broker with, for the user 
`username`."
-        type: string
-        format: password
-        x-descriptors:
-        - urn:camel:group:credentials
-      qos:
-        title: "Quality of Service"
-        description: "The highest quality of service to receive messages with: 
0 (at most once, with no confirmation), 1 (at least once, a message can arrive 
twice) or 2 (exactly once). The broker sends each message with the lower of 
this and the quality of service it was published with, which the `CamelMqttQoS` 
header tells. When it is not set, 2 is used."
-        type: integer
-        enum: [0, 1, 2]
-        example: 1
-      sslTruststoreLocation:
-        title: "SSL Truststore Location"
-        description: "The path of a trust store file, in JKS or PKCS12 format, 
with the certificate of the authority that signed the certificate of the 
broker. Needed only with an `ssl://` address when the broker uses a certificate 
that Java does not trust by default, such as one from a private or self-signed 
authority. Not used with `tcp://`."
-        type: string
-        example: "/etc/mqtt/truststore.jks"
-      sslTruststorePassword:
-        title: "SSL Truststore Password"
-        description: "The password of the trust store file in 
`sslTruststoreLocation`."
-        type: string
-        format: password
-        x-descriptors:
-        - urn:camel:group:credentials
-  dataTypes:
-    out:
-      headers:
-        CamelMqttTopic:
-          title: "Topic"
-          description: "The topic the message was published to. With a 
wildcard in `topic`, it tells which topic matched."
-          type: string
-        CamelMqttQoS:
-          title: "Quality of Service"
-          description: "The quality of service of the message as received: 0, 
1 or 2."
-          type: integer
-  dependencies:
-    - "camel:paho"
-    - "camel:kamelet"
-  template:
-    from:
-      uri: paho
-      parameters:
-        topic: "{{topic}}"
-        brokerUrl: "{{brokerUrl}}"
-        clientId: "{{?clientId}}"
-        password: "RAW({{?password}})"
-        userName: "RAW({{?username}})"
-        qos: "{{?qos}}"
-        "sslClientProps[com.ibm.ssl.trustStore]": "{{?sslTruststoreLocation}}"
-        "sslClientProps[com.ibm.ssl.trustStorePassword]": 
"RAW({{?sslTruststorePassword}})"
-      steps:
-        - to:
-            uri: kamelet:sink
diff --git a/kamelets/mqtt5-sink.kamelet.yaml b/kamelets/mqtt5-sink.kamelet.yaml
index 3770439db..e057411c4 100644
--- a/kamelets/mqtt5-sink.kamelet.yaml
+++ b/kamelets/mqtt5-sink.kamelet.yaml
@@ -33,7 +33,7 @@ spec:
     description: |-
       Publishes each message to a topic on an MQTT broker, such as Eclipse 
Mosquitto or HiveMQ, with MQTT 5.
 
-      Use it to send commands or data to IoT devices, or to publish readings 
and events, when the broker or the clients use MQTT 5. For a broker that only 
speaks MQTT 3.1.1, use `mqtt-sink`.
+      Use it to send commands or data to IoT devices, or to publish readings 
and events, when the broker or the clients use MQTT 5. The broker must support 
MQTT 5.
 
       Input: the body is the payload, as text or bytes, and is sent as it is. 
Turn structured data such as a Map into JSON text first, for example with 
`json-serialize-action`. The headers of the message are not sent, not even as 
MQTT 5 user properties.
 
diff --git a/kamelets/mqtt5-source.kamelet.yaml 
b/kamelets/mqtt5-source.kamelet.yaml
index 8a66db456..3d619115a 100644
--- a/kamelets/mqtt5-source.kamelet.yaml
+++ b/kamelets/mqtt5-source.kamelet.yaml
@@ -33,7 +33,7 @@ spec:
     description: |-
       Receives each message published to a topic on an MQTT broker, such as 
Eclipse Mosquitto or HiveMQ, with MQTT 5.
 
-      Use it to collect readings and events from IoT devices and other MQTT 
clients, when the broker or the clients use MQTT 5. A topic with wildcards, 
such as `sensors/#`, receives from many topics at once. For a broker that only 
speaks MQTT 3.1.1, use `mqtt-source`.
+      Use it to collect readings and events from IoT devices and other MQTT 
clients, when the broker or the clients use MQTT 5. A topic with wildcards, 
such as `sensors/#`, receives from many topics at once. The broker must support 
MQTT 5.
 
       Output: the body is the payload, as bytes. The `CamelMqttTopic` header 
is the topic the message was published to, `CamelMqttQoS` its quality of 
service, and `CamelPahoMqtt5MsgProperties` holds the MQTT 5 properties of the 
message, such as its user properties.
 
diff --git 
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
 
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
index ac5d38de0..d6a3436cb 100644
--- 
a/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
+++ 
b/library/camel-kamelets-catalog/src/main/java/org/apache/camel/kamelets/catalog/model/KameletPrefixSchemeEnum.java
@@ -83,7 +83,6 @@ public enum KameletPrefixSchemeEnum {
     minio("minio", "minio"),
     mongodb_changes_stream("mongodb-changes-stream", "mongodb"),
     mongodb("mongodb", "mongodb"),
-    mqtt("mqtt", "paho"),
     mqtt5("mqtt5", "paho-mqtt5"),
     ms_exchange("ms-exchange", "imaps"),
     mysql("mysql", "sql"),
diff --git 
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
 
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
index 449dc50dd..114cd9dbb 100644
--- 
a/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
+++ 
b/library/camel-kamelets-catalog/src/test/java/org/apache/camel/kamelets/catalog/KameletsCatalogTest.java
@@ -265,8 +265,6 @@ public class KameletsCatalogTest {
         verifyHeaders("mongodb-changes-stream-source", 3);
         verifyHeaders("mongodb-sink", 3);
         verifyHeaders("mongodb-source", 3);
-        verifyHeaders("mqtt-sink", 3);
-        verifyHeaders("mqtt-source", 2);
         verifyHeaders("mqtt5-sink", 3);
         verifyHeaders("mqtt5-source", 3);
         verifyHeaders("mysql-sink", 2);
diff --git 
a/library/camel-kamelets-catalog/src/test/resources/remove-headers/kamelets.csv 
b/library/camel-kamelets-catalog/src/test/resources/remove-headers/kamelets.csv
index e76c203d0..9d1ad9aa1 100644
--- 
a/library/camel-kamelets-catalog/src/test/resources/remove-headers/kamelets.csv
+++ 
b/library/camel-kamelets-catalog/src/test/resources/remove-headers/kamelets.csv
@@ -76,7 +76,6 @@ jsonata-action,CamelJsonata*,,CamelJsonataResourceUri,
 
kafka-sink,CamelKafka*,CamelKafka(Key|OverrideTopic),CamelKafkaOverrideTimestamp,CamelKafkaKey|CamelKafkaOverrideTopic
 minio-sink,CamelMinio*,,CamelMinioOverrideBucketName,
 mongodb-sink,CamelMongo*,,CamelMongoDbOperation,
-mqtt-sink,CamelPaho*,,CamelPahoOverrideTopic,
 mqtt5-sink,CamelPaho*,,CamelPahoMqtt5OverrideTopic,
 mustache-template-action,CamelMustache*,,CamelMustacheResourceUri,
 mvel-template-action,CamelMvel*,,CamelMvelResourceUri,
diff --git 
a/library/camel-kamelets/src/main/resources/META-INF/kamelets-index.json 
b/library/camel-kamelets/src/main/resources/META-INF/kamelets-index.json
index 97bbca733..1662628da 100644
--- a/library/camel-kamelets/src/main/resources/META-INF/kamelets-index.json
+++ b/library/camel-kamelets/src/main/resources/META-INF/kamelets-index.json
@@ -1499,33 +1499,13 @@
     "group" : "MongoDB",
     "namespace" : "Nosql",
     "provider" : "Apache Software Foundation"
-  }, {
-    "name" : "mqtt-sink",
-    "type" : "sink",
-    "supportLevel" : "Stable",
-    "title" : "MQTT Sink",
-    "summary" : "Publishes each message to a topic on an MQTT broker, such as 
Eclipse Mosquitto or HiveMQ, with MQTT 3.1.1.",
-    "description" : "Publishes each message to a topic on an MQTT broker, such 
as Eclipse Mosquitto or HiveMQ, with MQTT 3.1.1.\n\nUse it to send commands or 
data to IoT devices, or to publish readings and events for MQTT clients to 
receive. For a broker or clients that use MQTT 5, use `mqtt5-sink`.\n\nInput: 
the body is the payload, as text or bytes, and is sent as it is. A Map fails: 
turn it into JSON text first, for example with `json-serialize-action`. The 
headers of the message are  [...]
-    "group" : "MQTT",
-    "namespace" : "Messaging",
-    "provider" : "Apache Software Foundation"
-  }, {
-    "name" : "mqtt-source",
-    "type" : "source",
-    "supportLevel" : "Stable",
-    "title" : "MQTT Source",
-    "summary" : "Receives each message published to a topic on an MQTT broker, 
such as Eclipse Mosquitto or HiveMQ, with MQTT 3.1.1.",
-    "description" : "Receives each message published to a topic on an MQTT 
broker, such as Eclipse Mosquitto or HiveMQ, with MQTT 3.1.1.\n\nUse it to 
collect readings and events from IoT devices and other MQTT clients. A topic 
with wildcards, such as `sensors/#`, receives from many topics at once. For a 
broker or clients that use MQTT 5, use `mqtt5-source`.\n\nOutput: the body is 
the payload, as bytes. The `CamelMqttTopic` header is the topic the message was 
published to, and `CamelMqttQ [...]
-    "group" : "MQTT",
-    "namespace" : "Messaging",
-    "provider" : "Apache Software Foundation"
   }, {
     "name" : "mqtt5-sink",
     "type" : "sink",
     "supportLevel" : "Stable",
     "title" : "MQTT v5 Sink",
     "summary" : "Publishes each message to a topic on an MQTT broker, such as 
Eclipse Mosquitto or HiveMQ, with MQTT 5.",
-    "description" : "Publishes each message to a topic on an MQTT broker, such 
as Eclipse Mosquitto or HiveMQ, with MQTT 5.\n\nUse it to send commands or data 
to IoT devices, or to publish readings and events, when the broker or the 
clients use MQTT 5. For a broker that only speaks MQTT 3.1.1, use 
`mqtt-sink`.\n\nInput: the body is the payload, as text or bytes, and is sent 
as it is. Turn structured data such as a Map into JSON text first, for example 
with `json-serialize-action`. The he [...]
+    "description" : "Publishes each message to a topic on an MQTT broker, such 
as Eclipse Mosquitto or HiveMQ, with MQTT 5.\n\nUse it to send commands or data 
to IoT devices, or to publish readings and events, when the broker or the 
clients use MQTT 5. The broker must support MQTT 5.\n\nInput: the body is the 
payload, as text or bytes, and is sent as it is. Turn structured data such as a 
Map into JSON text first, for example with `json-serialize-action`. The headers 
of the message are no [...]
     "group" : "MQTT v5",
     "namespace" : "Messaging",
     "provider" : "Apache Software Foundation"
@@ -1535,7 +1515,7 @@
     "supportLevel" : "Stable",
     "title" : "MQTT 5 Source",
     "summary" : "Receives each message published to a topic on an MQTT broker, 
such as Eclipse Mosquitto or HiveMQ, with MQTT 5.",
-    "description" : "Receives each message published to a topic on an MQTT 
broker, such as Eclipse Mosquitto or HiveMQ, with MQTT 5.\n\nUse it to collect 
readings and events from IoT devices and other MQTT clients, when the broker or 
the clients use MQTT 5. A topic with wildcards, such as `sensors/#`, receives 
from many topics at once. For a broker that only speaks MQTT 3.1.1, use 
`mqtt-source`.\n\nOutput: the body is the payload, as bytes. The 
`CamelMqttTopic` header is the topic the me [...]
+    "description" : "Receives each message published to a topic on an MQTT 
broker, such as Eclipse Mosquitto or HiveMQ, with MQTT 5.\n\nUse it to collect 
readings and events from IoT devices and other MQTT clients, when the broker or 
the clients use MQTT 5. A topic with wildcards, such as `sensors/#`, receives 
from many topics at once. The broker must support MQTT 5.\n\nOutput: the body 
is the payload, as bytes. The `CamelMqttTopic` header is the topic the message 
was published to, `Came [...]
     "group" : "MQTT 5",
     "namespace" : "Messaging",
     "provider" : "Apache Software Foundation"
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/mqtt-sink.kamelet.yaml 
b/library/camel-kamelets/src/main/resources/kamelets/mqtt-sink.kamelet.yaml
deleted file mode 100644
index de6b125ca..000000000
--- a/library/camel-kamelets/src/main/resources/kamelets/mqtt-sink.kamelet.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Kamelet
-metadata:
-  name: mqtt-sink
-  annotations:
-    camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.24.0-SNAPSHOT"
-    camel.apache.org/kamelet.icon: 
"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjMuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMiIgYmFzZVByb2ZpbGU9InRpbnkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIKCSB5PSIwcHgiIHZpZXdCb3g9IjAgMCAzMjAgMzIwIiBvdmVyZmxvdz0idmlzaWJsZSIgeG1sOnNwYWNlPSJwcm
 [...]
-    camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/kamelet.group: "MQTT"
-    camel.apache.org/kamelet.namespace: "Messaging"
-  labels:
-    camel.apache.org/kamelet.type: "sink"
-spec:
-  definition:
-    title: "MQTT Sink"
-    description: |-
-      Publishes each message to a topic on an MQTT broker, such as Eclipse 
Mosquitto or HiveMQ, with MQTT 3.1.1.
-
-      Use it to send commands or data to IoT devices, or to publish readings 
and events for MQTT clients to receive. For a broker or clients that use MQTT 
5, use `mqtt5-sink`.
-
-      Input: the body is the payload, as text or bytes, and is sent as it is. 
A Map fails: turn it into JSON text first, for example with 
`json-serialize-action`. The headers of the message are not sent, as an MQTT 3 
message has none.
-
-      Output: the message is unchanged.
-
-      Good to know: messages are published with quality of service 2 (exactly 
once) unless `qos` is set, and the broker does not keep them for clients that 
subscribe later unless `retained` is true. It connects with no TLS unless 
`brokerUrl` starts with `ssl://`. With TLS it checks the certificate and the 
host name of the broker, and trusts the certificate authorities that Java 
trusts by default, or instead the ones in `sslTruststoreLocation`. It connects 
when the integration starts, and [...]
-    required:
-    - topic
-    - brokerUrl
-    type: object
-    properties:
-      topic:
-        title: "Topic"
-        description: "The topic to publish each message to, such as 
`sensors/temperature`. Wildcards (`+` and `#`) cannot be used here."
-        type: string
-        example: "sensors/temperature"
-      brokerUrl:
-        title: "Broker URL"
-        description: "The address of the MQTT broker, as `tcp://host:port` 
(usually port 1883), or `ssl://host:port` for TLS (usually port 8883). For a 
broker with a certificate from a private or self-signed authority, also set 
`sslTruststoreLocation`."
-        type: string
-        example: "tcp://mosquitto:1883"
-      username:
-        title: "Username"
-        description: "The user name to log in to the broker with. Leave it 
empty for a broker that accepts clients without a login."
-        type: string
-        x-descriptors:
-        - urn:camel:group:credentials
-      password:
-        title: "Password"
-        description: "The password to log in to the broker with, for the user 
`username`."
-        type: string
-        format: password
-        x-descriptors:
-        - urn:camel:group:credentials
-      qos:
-        title: "Quality of Service"
-        description: "The quality of service to publish each message with: 0 
(at most once, with no confirmation from the broker), 1 (at least once, a 
message can arrive twice) or 2 (exactly once). When it is not set, 2 is used. A 
subscriber receives the message with the lower of this and the quality of 
service it subscribed with."
-        type: integer
-        enum: [0, 1, 2]
-        example: 1
-      retained:
-        title: "Retained"
-        description: "Whether the broker keeps the message as the last one of 
the topic, and gives it to every client that subscribes to the topic later, 
such as the last known state of a device. Each retained message replaces the 
one before. When it is not set, messages are not retained."
-        type: boolean
-      sslTruststoreLocation:
-        title: "SSL Truststore Location"
-        description: "The path of a trust store file, in JKS or PKCS12 format, 
with the certificate of the authority that signed the certificate of the 
broker. Needed only with an `ssl://` address when the broker uses a certificate 
that Java does not trust by default, such as one from a private or self-signed 
authority. Not used with `tcp://`."
-        type: string
-        example: "/etc/mqtt/truststore.jks"
-      sslTruststorePassword:
-        title: "SSL Truststore Password"
-        description: "The password of the trust store file in 
`sslTruststoreLocation`."
-        type: string
-        format: password
-        x-descriptors:
-        - urn:camel:group:credentials
-  dependencies:
-    - "camel:paho"
-    - "camel:kamelet"
-  template:
-    from:
-      uri: kamelet:source
-      steps:
-        - removeHeaders:
-            pattern: CamelPaho*
-        - to:
-            uri: paho
-            parameters:
-              topic: "{{topic}}"
-              brokerUrl: "{{brokerUrl}}"
-              password: "RAW({{?password}})"
-              userName: "RAW({{?username}})"
-              qos: "{{?qos}}"
-              retained: "{{?retained}}"
-              "sslClientProps[com.ibm.ssl.trustStore]": 
"{{?sslTruststoreLocation}}"
-              "sslClientProps[com.ibm.ssl.trustStorePassword]": 
"RAW({{?sslTruststorePassword}})"
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/mqtt-source.kamelet.yaml 
b/library/camel-kamelets/src/main/resources/kamelets/mqtt-source.kamelet.yaml
deleted file mode 100644
index 969c68ac8..000000000
--- 
a/library/camel-kamelets/src/main/resources/kamelets/mqtt-source.kamelet.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-# ---------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ---------------------------------------------------------------------------
-apiVersion: camel.apache.org/v1
-kind: Kamelet
-metadata:
-  name: mqtt-source
-  annotations:
-    camel.apache.org/kamelet.support.level: "Stable"
-    camel.apache.org/catalog.version: "4.24.0-SNAPSHOT"
-    camel.apache.org/kamelet.icon: 
"data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4KPCEtLSBHZW5lcmF0b3I6IEFkb2JlIElsbHVzdHJhdG9yIDI0LjMuMCwgU1ZHIEV4cG9ydCBQbHVnLUluIC4gU1ZHIFZlcnNpb246IDYuMDAgQnVpbGQgMCkgIC0tPgo8c3ZnIHZlcnNpb249IjEuMiIgYmFzZVByb2ZpbGU9InRpbnkiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIKCSB5PSIwcHgiIHZpZXdCb3g9IjAgMCAzMjAgMzIwIiBvdmVyZmxvdz0idmlzaWJsZSIgeG1sOnNwYWNlPSJwcm
 [...]
-    camel.apache.org/provider: "Apache Software Foundation"
-    camel.apache.org/kamelet.group: "MQTT"
-    camel.apache.org/kamelet.namespace: "Messaging"
-  labels:
-    camel.apache.org/kamelet.type: "source"
-spec:
-  definition:
-    title: "MQTT Source"
-    description: |-
-      Receives each message published to a topic on an MQTT broker, such as 
Eclipse Mosquitto or HiveMQ, with MQTT 3.1.1.
-
-      Use it to collect readings and events from IoT devices and other MQTT 
clients. A topic with wildcards, such as `sensors/#`, receives from many topics 
at once. For a broker or clients that use MQTT 5, use `mqtt5-source`.
-
-      Output: the body is the payload, as bytes. The `CamelMqttTopic` header 
is the topic the message was published to, and `CamelMqttQoS` its quality of 
service.
-
-      Good to know: it receives only the messages published while it is 
connected, plus, when it subscribes, the last retained message of each matching 
topic. It subscribes with quality of service 2 (exactly once) unless `qos` is 
set. Each running copy needs its own `clientId`: two clients with the same ID 
keep pushing each other off the broker and lose messages. When it is not set, a 
unique one is generated. It connects with no TLS unless `brokerUrl` starts with 
`ssl://`. With TLS it ch [...]
-    required:
-    - topic
-    - brokerUrl
-    type: object
-    properties:
-      topic:
-        title: "Topic"
-        description: "The topic to subscribe to. `+` matches one level of the 
topic and `#` all the levels below, as in `sensors/+/temperature` or 
`sensors/#`."
-        type: string
-        example: "sensors/#"
-      brokerUrl:
-        title: "Broker URL"
-        description: "The address of the MQTT broker, as `tcp://host:port` 
(usually port 1883), or `ssl://host:port` for TLS (usually port 8883). For a 
broker with a certificate from a private or self-signed authority, also set 
`sslTruststoreLocation`."
-        type: string
-        example: "tcp://mosquitto:1883"
-      clientId:
-        title: "Client ID"
-        description: "The client ID that names this connection to the broker. 
It must be unique on the broker: a second client with the same ID pushes the 
first one off. When it is not set, a unique ID is generated."
-        example: "sensor-reader-1"
-        type: string
-      username:
-        title: "Username"
-        description: "The user name to log in to the broker with. Leave it 
empty for a broker that accepts clients without a login."
-        type: string
-        x-descriptors:
-        - urn:camel:group:credentials
-      password:
-        title: "Password"
-        description: "The password to log in to the broker with, for the user 
`username`."
-        type: string
-        format: password
-        x-descriptors:
-        - urn:camel:group:credentials
-      qos:
-        title: "Quality of Service"
-        description: "The highest quality of service to receive messages with: 
0 (at most once, with no confirmation), 1 (at least once, a message can arrive 
twice) or 2 (exactly once). The broker sends each message with the lower of 
this and the quality of service it was published with, which the `CamelMqttQoS` 
header tells. When it is not set, 2 is used."
-        type: integer
-        enum: [0, 1, 2]
-        example: 1
-      sslTruststoreLocation:
-        title: "SSL Truststore Location"
-        description: "The path of a trust store file, in JKS or PKCS12 format, 
with the certificate of the authority that signed the certificate of the 
broker. Needed only with an `ssl://` address when the broker uses a certificate 
that Java does not trust by default, such as one from a private or self-signed 
authority. Not used with `tcp://`."
-        type: string
-        example: "/etc/mqtt/truststore.jks"
-      sslTruststorePassword:
-        title: "SSL Truststore Password"
-        description: "The password of the trust store file in 
`sslTruststoreLocation`."
-        type: string
-        format: password
-        x-descriptors:
-        - urn:camel:group:credentials
-  dataTypes:
-    out:
-      headers:
-        CamelMqttTopic:
-          title: "Topic"
-          description: "The topic the message was published to. With a 
wildcard in `topic`, it tells which topic matched."
-          type: string
-        CamelMqttQoS:
-          title: "Quality of Service"
-          description: "The quality of service of the message as received: 0, 
1 or 2."
-          type: integer
-  dependencies:
-    - "camel:paho"
-    - "camel:kamelet"
-  template:
-    from:
-      uri: paho
-      parameters:
-        topic: "{{topic}}"
-        brokerUrl: "{{brokerUrl}}"
-        clientId: "{{?clientId}}"
-        password: "RAW({{?password}})"
-        userName: "RAW({{?username}})"
-        qos: "{{?qos}}"
-        "sslClientProps[com.ibm.ssl.trustStore]": "{{?sslTruststoreLocation}}"
-        "sslClientProps[com.ibm.ssl.trustStorePassword]": 
"RAW({{?sslTruststorePassword}})"
-      steps:
-        - to:
-            uri: kamelet:sink
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/mqtt5-sink.kamelet.yaml 
b/library/camel-kamelets/src/main/resources/kamelets/mqtt5-sink.kamelet.yaml
index 3770439db..e057411c4 100644
--- a/library/camel-kamelets/src/main/resources/kamelets/mqtt5-sink.kamelet.yaml
+++ b/library/camel-kamelets/src/main/resources/kamelets/mqtt5-sink.kamelet.yaml
@@ -33,7 +33,7 @@ spec:
     description: |-
       Publishes each message to a topic on an MQTT broker, such as Eclipse 
Mosquitto or HiveMQ, with MQTT 5.
 
-      Use it to send commands or data to IoT devices, or to publish readings 
and events, when the broker or the clients use MQTT 5. For a broker that only 
speaks MQTT 3.1.1, use `mqtt-sink`.
+      Use it to send commands or data to IoT devices, or to publish readings 
and events, when the broker or the clients use MQTT 5. The broker must support 
MQTT 5.
 
       Input: the body is the payload, as text or bytes, and is sent as it is. 
Turn structured data such as a Map into JSON text first, for example with 
`json-serialize-action`. The headers of the message are not sent, not even as 
MQTT 5 user properties.
 
diff --git 
a/library/camel-kamelets/src/main/resources/kamelets/mqtt5-source.kamelet.yaml 
b/library/camel-kamelets/src/main/resources/kamelets/mqtt5-source.kamelet.yaml
index 8a66db456..3d619115a 100644
--- 
a/library/camel-kamelets/src/main/resources/kamelets/mqtt5-source.kamelet.yaml
+++ 
b/library/camel-kamelets/src/main/resources/kamelets/mqtt5-source.kamelet.yaml
@@ -33,7 +33,7 @@ spec:
     description: |-
       Receives each message published to a topic on an MQTT broker, such as 
Eclipse Mosquitto or HiveMQ, with MQTT 5.
 
-      Use it to collect readings and events from IoT devices and other MQTT 
clients, when the broker or the clients use MQTT 5. A topic with wildcards, 
such as `sensors/#`, receives from many topics at once. For a broker that only 
speaks MQTT 3.1.1, use `mqtt-source`.
+      Use it to collect readings and events from IoT devices and other MQTT 
clients, when the broker or the clients use MQTT 5. A topic with wildcards, 
such as `sensors/#`, receives from many topics at once. The broker must support 
MQTT 5.
 
       Output: the body is the payload, as bytes. The `CamelMqttTopic` header 
is the topic the message was published to, `CamelMqttQoS` its quality of 
service, and `CamelPahoMqtt5MsgProperties` holds the MQTT 5 properties of the 
message, such as its user properties.
 
diff --git a/templates/pipes/camel-k/mqtt-sink-pipe.yaml 
b/templates/pipes/camel-k/mqtt-sink-pipe.yaml
deleted file mode 100644
index 145651c9f..000000000
--- a/templates/pipes/camel-k/mqtt-sink-pipe.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
-  name: mqtt-sink-pipe
-spec:
-  source:
-    ref:
-      kind: KafkaTopic
-      apiVersion: kafka.strimzi.io/v1beta1
-      name: my-topic
-  sink:
-    ref:
-      kind: Kamelet
-      apiVersion: camel.apache.org/v1
-      name: mqtt-sink
-    properties:
-      brokerUrl: "tcp://mosquitto:1883"
-      topic: "mytopic"
-  
\ No newline at end of file
diff --git a/templates/pipes/camel-k/mqtt-source-pipe.yaml 
b/templates/pipes/camel-k/mqtt-source-pipe.yaml
deleted file mode 100644
index 034fd476c..000000000
--- a/templates/pipes/camel-k/mqtt-source-pipe.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: camel.apache.org/v1
-kind: Pipe
-metadata:
-  name: mqtt-source-pipe
-spec:
-  source:
-    ref:
-      kind: Kamelet
-      apiVersion: camel.apache.org/v1
-      name: mqtt-source
-    properties:
-      brokerUrl: "tcp://mosquitto:1883"
-      topic: "mytopic"
-  sink:
-    ref:
-      kind: KafkaTopic
-      apiVersion: kafka.strimzi.io/v1beta1
-      name: my-topic
-  
\ No newline at end of file
diff --git a/templates/pipes/core/mqtt-sink-pipe.yaml 
b/templates/pipes/core/mqtt-sink-pipe.yaml
deleted file mode 100644
index 1b0e4cd7d..000000000
--- a/templates/pipes/core/mqtt-sink-pipe.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-- route:
-    from:
-      uri: "kamelet:timer-source"
-      parameters:
-        period: 1000
-        message: "Hello Camel JBang"
-      steps:
-        - to:
-            uri: "kamelet:mqtt-sink"
-            parameters:
-              brokerUrl: "tcp://mosquitto:1883"
-              topic: "mytopic"
diff --git a/templates/pipes/core/mqtt-source-pipe.yaml 
b/templates/pipes/core/mqtt-source-pipe.yaml
deleted file mode 100644
index 281eadb09..000000000
--- a/templates/pipes/core/mqtt-source-pipe.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-- route:
-    from:
-      uri: "kamelet:mqtt-source"
-      parameters:
-        brokerUrl: "tcp://mosquitto:1883"
-        topic: "mytopic"
-      steps:
-        - to:
-            uri: "log:info"

Reply via email to