From d5739c3c6ed0021829b787244929bd80e4a5614b Mon Sep 17 00:00:00 2001
From: Andrea Tarocchi <andrea.tarocchi@gmail.com>
Date: Tue, 29 Oct 2024 11:10:19 +0100
Subject: [PATCH 1/2] Added the handling of
 https://github.com/apache/camel-kamelets/issues/2260 corner case in
 connectors generated by kamelets

---
 .../maven/CamelKafkaConnectorKameletUpdateMojo.java        | 7 +++++--
 .../kafkaconnector/maven/utils/YamlKameletMapper.java      | 6 +++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
index 18da9d7e62..891c1f0eaa 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/CamelKafkaConnectorKameletUpdateMojo.java
@@ -253,13 +253,16 @@ private void updateConnector() throws Exception {
 
     private Set<String> getKameletDependencies(KameletModel kamelet) throws XPathExpressionException {
         Set<String> deps = new HashSet<>(kamelet.getDependencies());
-        Set<String> gavDeps = deps.stream().map(stringDep -> {
+        Set<String> gavDeps = deps.stream()
+        .filter(stringDep -> stringDep != null && !stringDep.trim().isEmpty() && !"null".equals(stringDep.trim()))
+        .map(stringDep -> {
             if (stringDep.startsWith("mvn:")) {
                 return stringDep.replaceFirst("mvn:", "");
             } else if (stringDep.startsWith("camel:")) {
                 return getMainDepGroupId() + ":" + stringDep.replaceFirst(":", "-");
             } else {
-                getLog().warn("Dependency " + stringDep + "is used as is. Might not be the intended behaviour!");
+                String length = stringDep == null ?  "the string is null value" : Integer.toString(stringDep.length());
+                getLog().warn("Dependency string: " + stringDep + " (length of the string is: " + length + ") is used as is. Might not be the intended behaviour!");
                 return stringDep;
             }
         }).collect(Collectors.toSet());
diff --git a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/YamlKameletMapper.java b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/YamlKameletMapper.java
index 6cae0513a0..5f21226270 100644
--- a/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/YamlKameletMapper.java
+++ b/tooling/camel-kafka-connector-generator-maven-plugin/src/main/java/org/apache/camel/kafkaconnector/maven/utils/YamlKameletMapper.java
@@ -65,7 +65,11 @@ public static KameletModel parseKameletYaml(ObjectNode kameletYamlNode) {
         km.setRequiredProperties(requiredProperties);
 
         Set<String> dependencies = new HashSet<>();
-        kameletYamlNode.at("/spec/dependencies").forEach(req -> dependencies.add(req.asText()));
+        kameletYamlNode.at("/spec/dependencies").forEach(req -> {
+            if (req != null && !req.isNull()) {
+                dependencies.add(req.asText());
+            }
+        });
         km.setDependencies(dependencies);
 
         List<KameletPropertyModel> kpms = new ArrayList<>();

From c5b098f822715102e274dfda8cf5613cd0ecb740 Mon Sep 17 00:00:00 2001
From: Andrea Tarocchi <andrea.tarocchi@gmail.com>
Date: Tue, 29 Oct 2024 16:39:07 +0100
Subject: [PATCH 2/2] chore: regen.

---
 connectors/camel-aws-ddb-sink-kafka-connector/pom.xml        | 5 -----
 .../src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml    | 1 -
 .../camel-aws-ddb-streams-source-kafka-connector/pom.xml     | 5 -----
 .../resources/kamelets/aws-ddb-streams-source.kamelet.yaml   | 2 +-
 connectors/camel-aws-kinesis-source-kafka-connector/pom.xml  | 5 -----
 .../main/resources/kamelets/aws-kinesis-source.kamelet.yaml  | 1 -
 connectors/camel-aws-s3-source-kafka-connector/pom.xml       | 5 -----
 .../src/main/resources/kamelets/aws-s3-source.kamelet.yaml   | 1 -
 connectors/camel-aws-sqs-source-kafka-connector/pom.xml      | 5 -----
 .../src/main/resources/kamelets/aws-sqs-source.kamelet.yaml  | 1 -
 .../camel-azure-storage-blob-source-kafka-connector/pom.xml  | 5 -----
 .../kamelets/azure-storage-blob-source.kamelet.yaml          | 1 -
 .../pom.xml                                                  | 5 -----
 .../kamelets/azure-storage-datalake-sink.kamelet.yaml        | 1 -
 .../pom.xml                                                  | 5 -----
 .../kamelets/azure-storage-datalake-source.kamelet.yaml      | 1 -
 .../camel-azure-storage-queue-source-kafka-connector/pom.xml | 5 -----
 .../kamelets/azure-storage-queue-source.kamelet.yaml         | 1 -
 connectors/camel-google-sheets-sink-kafka-connector/pom.xml  | 5 -----
 .../main/resources/kamelets/google-sheets-sink.kamelet.yaml  | 1 -
 .../pom.xml                                                  | 2 +-
 .../kamelets/jms-pooled-apache-artemis-sink.kamelet.yaml     | 2 +-
 .../pom.xml                                                  | 2 +-
 .../kamelets/jms-pooled-apache-artemis-source.kamelet.yaml   | 2 +-
 .../pom.xml                                                  | 5 -----
 .../kamelets/kafka-azure-schema-registry-sink.kamelet.yaml   | 1 -
 .../pom.xml                                                  | 5 -----
 .../kamelets/kafka-azure-schema-registry-source.kamelet.yaml | 3 +--
 .../pom.xml                                                  | 5 -----
 ...a-batch-apicurio-registry-not-secured-source.kamelet.yaml | 3 +--
 .../pom.xml                                                  | 5 -----
 .../kafka-batch-apicurio-registry-source.kamelet.yaml        | 3 +--
 .../pom.xml                                                  | 5 -----
 .../kafka-batch-azure-schema-registry-source.kamelet.yaml    | 3 +--
 .../pom.xml                                                  | 5 -----
 .../kamelets/kafka-batch-not-secured-source.kamelet.yaml     | 3 +--
 .../camel-kafka-batch-scram-source-kafka-connector/pom.xml   | 5 -----
 .../resources/kamelets/kafka-batch-scram-source.kamelet.yaml | 3 +--
 connectors/camel-kafka-batch-source-kafka-connector/pom.xml  | 5 -----
 .../main/resources/kamelets/kafka-batch-source.kamelet.yaml  | 3 +--
 .../camel-kafka-batch-ssl-source-kafka-connector/pom.xml     | 5 -----
 .../resources/kamelets/kafka-batch-ssl-source.kamelet.yaml   | 3 +--
 .../pom.xml                                                  | 5 -----
 ...ka-not-secured-apicurio-registry-json-source.kamelet.yaml | 3 +--
 .../pom.xml                                                  | 5 -----
 .../kafka-not-secured-apicurio-registry-source.kamelet.yaml  | 3 +--
 .../camel-kafka-not-secured-sink-kafka-connector/pom.xml     | 5 -----
 .../resources/kamelets/kafka-not-secured-sink.kamelet.yaml   | 1 -
 .../camel-kafka-not-secured-source-kafka-connector/pom.xml   | 5 -----
 .../resources/kamelets/kafka-not-secured-source.kamelet.yaml | 3 +--
 connectors/camel-kafka-scram-source-kafka-connector/pom.xml  | 5 -----
 .../main/resources/kamelets/kafka-scram-source.kamelet.yaml  | 3 +--
 connectors/camel-kafka-source-kafka-connector/pom.xml        | 5 -----
 .../src/main/resources/kamelets/kafka-source.kamelet.yaml    | 3 +--
 connectors/camel-kafka-ssl-source-kafka-connector/pom.xml    | 5 -----
 .../main/resources/kamelets/kafka-ssl-source.kamelet.yaml    | 3 +--
 .../pom.xml                                                  | 5 -----
 .../kamelets/mongodb-changes-stream-source.kamelet.yaml      | 3 +--
 connectors/camel-mongodb-sink-kafka-connector/pom.xml        | 5 -----
 .../src/main/resources/kamelets/mongodb-sink.kamelet.yaml    | 3 +--
 connectors/camel-mongodb-source-kafka-connector/pom.xml      | 5 -----
 .../src/main/resources/kamelets/mongodb-source.kamelet.yaml  | 3 +--
 .../src/main/resources/kamelets/sftp-source.kamelet.yaml     | 2 +-
 63 files changed, 23 insertions(+), 196 deletions(-)

diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/pom.xml b/connectors/camel-aws-ddb-sink-kafka-connector/pom.xml
index d3b6d82cf4..ca0767bcd7 100644
--- a/connectors/camel-aws-ddb-sink-kafka-connector/pom.xml
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/pom.xml
@@ -65,11 +65,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
index df312272b0..e24257ad86 100644
--- a/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
+++ b/connectors/camel-aws-ddb-sink-kafka-connector/src/main/resources/kamelets/aws-ddb-sink.kamelet.yaml
@@ -159,7 +159,6 @@ spec:
                 type: object
                 description: Attribute value map specifies all attributes to change with the given operation.
   dependencies:
-  - mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT
   - "camel:core"
   - "camel:jackson"
   - "camel:aws2-ddb"
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/pom.xml b/connectors/camel-aws-ddb-streams-source-kafka-connector/pom.xml
index 2c21902776..40051c148f 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/pom.xml
+++ b/connectors/camel-aws-ddb-streams-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
index 13423b842a..b9821aa7bb 100644
--- a/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
+++ b/connectors/camel-aws-ddb-streams-source-kafka-connector/src/main/resources/kamelets/aws-ddb-streams-source.kamelet.yaml
@@ -155,7 +155,7 @@ spec:
               description: The exchange creation timestamp as event time.
               type: string
   dependencies:
-  - mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT
+  - 
   - "camel:gson"
   - "camel:aws2-ddb"
   - "camel:kamelet"
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/pom.xml b/connectors/camel-aws-kinesis-source-kafka-connector/pom.xml
index 3a8bde42c4..21267ed7cd 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/pom.xml
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/pom.xml
@@ -57,11 +57,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-aws2-kinesis</artifactId>
diff --git a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
index 3036d8a45a..e8a86e3bf3 100644
--- a/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
+++ b/connectors/camel-aws-kinesis-source-kafka-connector/src/main/resources/kamelets/aws-kinesis-source.kamelet.yaml
@@ -129,7 +129,6 @@ spec:
     - "camel:aws2-kinesis"
     - "camel:kamelet"
     - "camel:core"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
   template:
     from:
       uri: aws2-kinesis:{{stream}}
diff --git a/connectors/camel-aws-s3-source-kafka-connector/pom.xml b/connectors/camel-aws-s3-source-kafka-connector/pom.xml
index 871b0b96da..a2f6f4b6cc 100644
--- a/connectors/camel-aws-s3-source-kafka-connector/pom.xml
+++ b/connectors/camel-aws-s3-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-aws-s3-source-kafka-connector/src/main/resources/kamelets/aws-s3-source.kamelet.yaml b/connectors/camel-aws-s3-source-kafka-connector/src/main/resources/kamelets/aws-s3-source.kamelet.yaml
index a55cb9d555..2533666131 100644
--- a/connectors/camel-aws-s3-source-kafka-connector/src/main/resources/kamelets/aws-s3-source.kamelet.yaml
+++ b/connectors/camel-aws-s3-source-kafka-connector/src/main/resources/kamelets/aws-s3-source.kamelet.yaml
@@ -212,7 +212,6 @@ spec:
   dependencies:
     - "camel:core"
     - "camel:aws2-s3"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kamelet"
   template:
     from:
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/pom.xml b/connectors/camel-aws-sqs-source-kafka-connector/pom.xml
index 20aea286aa..299bc2aef4 100644
--- a/connectors/camel-aws-sqs-source-kafka-connector/pom.xml
+++ b/connectors/camel-aws-sqs-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml b/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
index 8dd508e1b4..9fdc5edd68 100644
--- a/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
+++ b/connectors/camel-aws-sqs-source-kafka-connector/src/main/resources/kamelets/aws-sqs-source.kamelet.yaml
@@ -227,7 +227,6 @@ spec:
   dependencies:
     - "camel:core"
     - "camel:aws2-sqs"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kamelet"
   template:
     from:
diff --git a/connectors/camel-azure-storage-blob-source-kafka-connector/pom.xml b/connectors/camel-azure-storage-blob-source-kafka-connector/pom.xml
index edf1a0b50b..354a718a2d 100644
--- a/connectors/camel-azure-storage-blob-source-kafka-connector/pom.xml
+++ b/connectors/camel-azure-storage-blob-source-kafka-connector/pom.xml
@@ -69,11 +69,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml b/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
index 2f840de489..424915da62 100644
--- a/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-blob-source-kafka-connector/src/main/resources/kamelets/azure-storage-blob-source.kamelet.yaml
@@ -149,7 +149,6 @@ spec:
     - "camel:core"
     - "camel:jsonpath"
     - "camel:timer"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
   template:
     from:
       uri: "azure-storage-blob:{{accountName}}/{{containerName}}"
diff --git a/connectors/camel-azure-storage-datalake-sink-kafka-connector/pom.xml b/connectors/camel-azure-storage-datalake-sink-kafka-connector/pom.xml
index c831e71ac9..ace6d82024 100644
--- a/connectors/camel-azure-storage-datalake-sink-kafka-connector/pom.xml
+++ b/connectors/camel-azure-storage-datalake-sink-kafka-connector/pom.xml
@@ -65,11 +65,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml b/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
index 4a267d3d4d..569d2a9fcf 100644
--- a/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
+++ b/connectors/camel-azure-storage-datalake-sink-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-sink.kamelet.yaml
@@ -85,7 +85,6 @@ spec:
     - "camel:kamelet"
     - "camel:core"
     - "camel:timer"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
   template:
     from:
       uri: "kamelet:source"
diff --git a/connectors/camel-azure-storage-datalake-source-kafka-connector/pom.xml b/connectors/camel-azure-storage-datalake-source-kafka-connector/pom.xml
index ba9bfe0d42..d8f57838f0 100644
--- a/connectors/camel-azure-storage-datalake-source-kafka-connector/pom.xml
+++ b/connectors/camel-azure-storage-datalake-source-kafka-connector/pom.xml
@@ -65,11 +65,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml b/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
index 1fbe3860ad..159ee5ffed 100644
--- a/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-datalake-source-kafka-connector/src/main/resources/kamelets/azure-storage-datalake-source.kamelet.yaml
@@ -231,7 +231,6 @@ spec:
     - "camel:kamelet"
     - "camel:core"
     - "camel:timer"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
   template:
     from:
       uri: "azure-storage-datalake:{{accountName}}/{{fileSystemName}}"
diff --git a/connectors/camel-azure-storage-queue-source-kafka-connector/pom.xml b/connectors/camel-azure-storage-queue-source-kafka-connector/pom.xml
index f285e94319..c1b0093f39 100644
--- a/connectors/camel-azure-storage-queue-source-kafka-connector/pom.xml
+++ b/connectors/camel-azure-storage-queue-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml b/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml
index 043a2172e4..79de36ac80 100644
--- a/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml
+++ b/connectors/camel-azure-storage-queue-source-kafka-connector/src/main/resources/kamelets/azure-storage-queue-source.kamelet.yaml
@@ -133,7 +133,6 @@ spec:
   dependencies:
     - "camel:azure-storage-queue"
     - "camel:kamelet"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:core"
   template:
     from:
diff --git a/connectors/camel-google-sheets-sink-kafka-connector/pom.xml b/connectors/camel-google-sheets-sink-kafka-connector/pom.xml
index c8acadc5b1..9e845ee17e 100644
--- a/connectors/camel-google-sheets-sink-kafka-connector/pom.xml
+++ b/connectors/camel-google-sheets-sink-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-google-sheets</artifactId>
diff --git a/connectors/camel-google-sheets-sink-kafka-connector/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml b/connectors/camel-google-sheets-sink-kafka-connector/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
index 3f0846fd72..67b9cca52b 100644
--- a/connectors/camel-google-sheets-sink-kafka-connector/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
+++ b/connectors/camel-google-sheets-sink-kafka-connector/src/main/resources/kamelets/google-sheets-sink.kamelet.yaml
@@ -146,7 +146,6 @@ spec:
               type: string
           mediaType: application/json
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:core"
     - "camel:jackson"
     - "camel:kamelet"
diff --git a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/pom.xml b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/pom.xml
index 2c879516be..3c03b338f2 100644
--- a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/pom.xml
+++ b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.messaginghub</groupId>
       <artifactId>pooled-jms</artifactId>
-      <version>3.1.6</version>
+      <version>3.1.7</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
diff --git a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-sink.kamelet.yaml b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-sink.kamelet.yaml
index dc0a54757b..37a7cf164b 100644
--- a/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-sink.kamelet.yaml
+++ b/connectors/camel-jms-pooled-apache-artemis-sink-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-sink.kamelet.yaml
@@ -87,7 +87,7 @@ spec:
   - "camel:jms"
   - "camel:kamelet"
   - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.37.0"
-  - "mvn:org.messaginghub:pooled-jms:3.1.6"
+  - "mvn:org.messaginghub:pooled-jms:3.1.7"
   template:
     beans:
       - name: connectionFactoryBean
diff --git a/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/pom.xml b/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/pom.xml
index ae5c34366b..5200ee1110 100644
--- a/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/pom.xml
+++ b/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/pom.xml
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.messaginghub</groupId>
       <artifactId>pooled-jms</artifactId>
-      <version>3.1.6</version>
+      <version>3.1.7</version>
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
diff --git a/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-source.kamelet.yaml b/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-source.kamelet.yaml
index be07080a93..f5d7af196b 100644
--- a/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-source.kamelet.yaml
+++ b/connectors/camel-jms-pooled-apache-artemis-source-kafka-connector/src/main/resources/kamelets/jms-pooled-apache-artemis-source.kamelet.yaml
@@ -86,7 +86,7 @@ spec:
   - "camel:jms"
   - "camel:kamelet"
   - "mvn:org.apache.activemq:artemis-jakarta-client-all:2.37.0"
-  - "mvn:org.messaginghub:pooled-jms:3.1.6"
+  - "mvn:org.messaginghub:pooled-jms:3.1.7"
   template:
     beans:
       - name: connectionFactoryBean
diff --git a/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/pom.xml b/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/pom.xml
index c6d1e3f0c2..1c8ab4f8fc 100644
--- a/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/pom.xml
@@ -80,11 +80,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml b/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml
index e890d98d2d..faeb58585e 100644
--- a/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml
+++ b/connectors/camel-kafka-azure-schema-registry-sink-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-sink.kamelet.yaml
@@ -90,7 +90,6 @@ spec:
         type: string
         example: "com.example.Order"
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:core"
     - "camel:kafka"
     - "camel:kamelet"
diff --git a/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/pom.xml b/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/pom.xml
index d61bc5aa71..e6160f8384 100644
--- a/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/pom.xml
@@ -80,11 +80,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-source.kamelet.yaml b/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-source.kamelet.yaml
index ca26d65d88..5f528df82b 100644
--- a/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-source.kamelet.yaml
+++ b/connectors/camel-kafka-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-azure-schema-registry-source.kamelet.yaml
@@ -131,7 +131,6 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kafka"
     - "camel:core"
     - "camel:kamelet"
@@ -144,7 +143,7 @@ spec:
       - name: defaultAzureCredential
         type: "#class:org.apache.camel.component.azure.schema.registry.DefaultAzureCredentialWrapper"
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
     from:
diff --git a/connectors/camel-kafka-batch-apicurio-registry-not-secured-source-kafka-connector/pom.xml b/connectors/camel-kafka-batch-apicurio-registry-not-secured-source-kafka-connector/pom.xml
index 3329b4df8f..65568f72f3 100644
--- a/connectors/camel-kafka-batch-apicurio-registry-not-secured-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-batch-apicurio-registry-not-secured-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-apicurio-registry-avro</artifactId>
diff --git a/connectors/camel-kafka-batch-apicurio-registry-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml b/connectors/camel-kafka-batch-apicurio-registry-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
index d2140d7481..e71eb36fbf 100644
--- a/connectors/camel-kafka-batch-apicurio-registry-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
+++ b/connectors/camel-kafka-batch-apicurio-registry-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-batch-apicurio-registry-not-secured-source.kamelet.yaml
@@ -125,7 +125,6 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kafka"
     - "camel:core"
     - "camel:kamelet"
@@ -133,7 +132,7 @@ spec:
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
       - name: manualCommitFactory
diff --git a/connectors/camel-kafka-batch-apicurio-registry-source-kafka-connector/pom.xml b/connectors/camel-kafka-batch-apicurio-registry-source-kafka-connector/pom.xml
index a8b9413f21..eb8be73df4 100644
--- a/connectors/camel-kafka-batch-apicurio-registry-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-batch-apicurio-registry-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-apicurio-registry-avro</artifactId>
diff --git a/connectors/camel-kafka-batch-apicurio-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml b/connectors/camel-kafka-batch-apicurio-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
index 50ccde23c8..d13eab16d2 100644
--- a/connectors/camel-kafka-batch-apicurio-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
+++ b/connectors/camel-kafka-batch-apicurio-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-apicurio-registry-source.kamelet.yaml
@@ -166,7 +166,6 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kafka"
     - "camel:core"
     - "camel:kamelet"
@@ -174,7 +173,7 @@ spec:
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
       - name: manualCommitFactory
diff --git a/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/pom.xml b/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/pom.xml
index 63f019581e..95e6a41476 100644
--- a/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/pom.xml
@@ -80,11 +80,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml b/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
index f60bb47cde..8f3df06b64 100644
--- a/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
+++ b/connectors/camel-kafka-batch-azure-schema-registry-source-kafka-connector/src/main/resources/kamelets/kafka-batch-azure-schema-registry-source.kamelet.yaml
@@ -145,7 +145,6 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kafka"
     - "camel:core"
     - "camel:kamelet"
@@ -158,7 +157,7 @@ spec:
       - name: defaultAzureCredential
         type: "#class:org.apache.camel.component.azure.schema.registry.DefaultAzureCredentialWrapper"
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
       - name: manualCommitFactory
diff --git a/connectors/camel-kafka-batch-not-secured-source-kafka-connector/pom.xml b/connectors/camel-kafka-batch-not-secured-source-kafka-connector/pom.xml
index 23c193b812..d437ff2b31 100644
--- a/connectors/camel-kafka-batch-not-secured-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-batch-not-secured-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-batch-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-batch-not-secured-source.kamelet.yaml b/connectors/camel-kafka-batch-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-batch-not-secured-source.kamelet.yaml
index 83a5150c7f..073a2f7557 100644
--- a/connectors/camel-kafka-batch-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-batch-not-secured-source.kamelet.yaml
+++ b/connectors/camel-kafka-batch-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-batch-not-secured-source.kamelet.yaml
@@ -107,14 +107,13 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kafka"
     - "camel:core"
     - "camel:kamelet"
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
       - name: manualCommitFactory
diff --git a/connectors/camel-kafka-batch-scram-source-kafka-connector/pom.xml b/connectors/camel-kafka-batch-scram-source-kafka-connector/pom.xml
index 4dea363a6b..0d8c4e8a5d 100644
--- a/connectors/camel-kafka-batch-scram-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-batch-scram-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-batch-scram-source-kafka-connector/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml b/connectors/camel-kafka-batch-scram-source-kafka-connector/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
index 57f2643beb..8856fae808 100644
--- a/connectors/camel-kafka-batch-scram-source-kafka-connector/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
+++ b/connectors/camel-kafka-batch-scram-source-kafka-connector/src/main/resources/kamelets/kafka-batch-scram-source.kamelet.yaml
@@ -138,14 +138,13 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:core"
     - "camel:kafka"
     - "camel:kamelet"
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
       - name: manualCommitFactory
diff --git a/connectors/camel-kafka-batch-source-kafka-connector/pom.xml b/connectors/camel-kafka-batch-source-kafka-connector/pom.xml
index 5573a0cc58..7bc5a19344 100644
--- a/connectors/camel-kafka-batch-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-batch-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-batch-source-kafka-connector/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml b/connectors/camel-kafka-batch-source-kafka-connector/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
index 8a1bb888cd..4f19ea8377 100644
--- a/connectors/camel-kafka-batch-source-kafka-connector/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
+++ b/connectors/camel-kafka-batch-source-kafka-connector/src/main/resources/kamelets/kafka-batch-source.kamelet.yaml
@@ -138,14 +138,13 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:core"
     - "camel:kafka"
     - "camel:kamelet"
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
       - name: manualCommitFactory
diff --git a/connectors/camel-kafka-batch-ssl-source-kafka-connector/pom.xml b/connectors/camel-kafka-batch-ssl-source-kafka-connector/pom.xml
index 375ad29589..ac84f0d077 100644
--- a/connectors/camel-kafka-batch-ssl-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-batch-ssl-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-batch-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml b/connectors/camel-kafka-batch-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
index a897151ccd..4cb042ea13 100644
--- a/connectors/camel-kafka-batch-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
+++ b/connectors/camel-kafka-batch-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-batch-ssl-source.kamelet.yaml
@@ -162,7 +162,6 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:core"
     - "camel:kafka"
     - "camel:kamelet"
@@ -198,7 +197,7 @@ spec:
           topicIsPattern: "{{topicIsPattern}}"
         type: '#class:org.apache.camel.component.kafka.KafkaConfiguration'
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
     from:
diff --git a/connectors/camel-kafka-not-secured-apicurio-registry-json-source-kafka-connector/pom.xml b/connectors/camel-kafka-not-secured-apicurio-registry-json-source-kafka-connector/pom.xml
index 0c7a1f83b8..433c3384c3 100644
--- a/connectors/camel-kafka-not-secured-apicurio-registry-json-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-not-secured-apicurio-registry-json-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>io.apicurio</groupId>
       <artifactId>apicurio-registry-serdes-jsonschema-serde</artifactId>
diff --git a/connectors/camel-kafka-not-secured-apicurio-registry-json-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml b/connectors/camel-kafka-not-secured-apicurio-registry-json-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
index 67761cbf8f..99887493af 100644
--- a/connectors/camel-kafka-not-secured-apicurio-registry-json-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
+++ b/connectors/camel-kafka-not-secured-apicurio-registry-json-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-json-source.kamelet.yaml
@@ -147,7 +147,6 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kafka"
     - "camel:core"
     - "camel:kamelet"
@@ -155,7 +154,7 @@ spec:
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
     from:
diff --git a/connectors/camel-kafka-not-secured-apicurio-registry-source-kafka-connector/pom.xml b/connectors/camel-kafka-not-secured-apicurio-registry-source-kafka-connector/pom.xml
index 317da00605..315113acea 100644
--- a/connectors/camel-kafka-not-secured-apicurio-registry-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-not-secured-apicurio-registry-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-apicurio-registry-avro</artifactId>
diff --git a/connectors/camel-kafka-not-secured-apicurio-registry-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml b/connectors/camel-kafka-not-secured-apicurio-registry-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
index 450a4d9a2f..1c83f0afce 100644
--- a/connectors/camel-kafka-not-secured-apicurio-registry-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
+++ b/connectors/camel-kafka-not-secured-apicurio-registry-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-apicurio-registry-source.kamelet.yaml
@@ -152,7 +152,6 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kafka"
     - "camel:core"
     - "camel:kamelet"
@@ -160,7 +159,7 @@ spec:
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
     from:
diff --git a/connectors/camel-kafka-not-secured-sink-kafka-connector/pom.xml b/connectors/camel-kafka-not-secured-sink-kafka-connector/pom.xml
index e6a220ee96..2de12f75b7 100644
--- a/connectors/camel-kafka-not-secured-sink-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-not-secured-sink-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-not-secured-sink-kafka-connector/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml b/connectors/camel-kafka-not-secured-sink-kafka-connector/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml
index 814278901d..698b2b4294 100644
--- a/connectors/camel-kafka-not-secured-sink-kafka-connector/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml
+++ b/connectors/camel-kafka-not-secured-sink-kafka-connector/src/main/resources/kamelets/kafka-not-secured-sink.kamelet.yaml
@@ -56,7 +56,6 @@ spec:
   dependencies:
     - "camel:core"
     - "camel:kafka"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kamelet"
   template:
     from:
diff --git a/connectors/camel-kafka-not-secured-source-kafka-connector/pom.xml b/connectors/camel-kafka-not-secured-source-kafka-connector/pom.xml
index eed82027fa..f554dc9280 100644
--- a/connectors/camel-kafka-not-secured-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-not-secured-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-source.kamelet.yaml b/connectors/camel-kafka-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-source.kamelet.yaml
index 8377f86af8..ff1582f9d0 100644
--- a/connectors/camel-kafka-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-source.kamelet.yaml
+++ b/connectors/camel-kafka-not-secured-source-kafka-connector/src/main/resources/kamelets/kafka-not-secured-source.kamelet.yaml
@@ -93,14 +93,13 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:kafka"
     - "camel:core"
     - "camel:kamelet"
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
     from:
diff --git a/connectors/camel-kafka-scram-source-kafka-connector/pom.xml b/connectors/camel-kafka-scram-source-kafka-connector/pom.xml
index 13a9c02912..9a0bf9ea03 100644
--- a/connectors/camel-kafka-scram-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-scram-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-scram-source-kafka-connector/src/main/resources/kamelets/kafka-scram-source.kamelet.yaml b/connectors/camel-kafka-scram-source-kafka-connector/src/main/resources/kamelets/kafka-scram-source.kamelet.yaml
index c8fe4b0d2d..96de068e02 100644
--- a/connectors/camel-kafka-scram-source-kafka-connector/src/main/resources/kamelets/kafka-scram-source.kamelet.yaml
+++ b/connectors/camel-kafka-scram-source-kafka-connector/src/main/resources/kamelets/kafka-scram-source.kamelet.yaml
@@ -124,14 +124,13 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:core"
     - "camel:kafka"
     - "camel:kamelet"
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
     from:
diff --git a/connectors/camel-kafka-source-kafka-connector/pom.xml b/connectors/camel-kafka-source-kafka-connector/pom.xml
index 08b9256504..2cc92740fc 100644
--- a/connectors/camel-kafka-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-source-kafka-connector/src/main/resources/kamelets/kafka-source.kamelet.yaml b/connectors/camel-kafka-source-kafka-connector/src/main/resources/kamelets/kafka-source.kamelet.yaml
index 9f1c5ab85b..e053fc5042 100644
--- a/connectors/camel-kafka-source-kafka-connector/src/main/resources/kamelets/kafka-source.kamelet.yaml
+++ b/connectors/camel-kafka-source-kafka-connector/src/main/resources/kamelets/kafka-source.kamelet.yaml
@@ -124,14 +124,13 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:core"
     - "camel:kafka"
     - "camel:kamelet"
   template:
     beans:
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
     from:
diff --git a/connectors/camel-kafka-ssl-source-kafka-connector/pom.xml b/connectors/camel-kafka-ssl-source-kafka-connector/pom.xml
index b5d24d0e2b..6f71ec6dec 100644
--- a/connectors/camel-kafka-ssl-source-kafka-connector/pom.xml
+++ b/connectors/camel-kafka-ssl-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-kafka-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml b/connectors/camel-kafka-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
index 230841d446..4b28e1bf1c 100644
--- a/connectors/camel-kafka-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
+++ b/connectors/camel-kafka-ssl-source-kafka-connector/src/main/resources/kamelets/kafka-ssl-source.kamelet.yaml
@@ -148,7 +148,6 @@ spec:
         type: boolean
         default: false
   dependencies:
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
     - "camel:core"
     - "camel:kafka"
     - "camel:kamelet"
@@ -177,7 +176,7 @@ spec:
           topicIsPattern: '{{topicIsPattern}}'
         type: '#class:org.apache.camel.component.kafka.KafkaConfiguration'
       - name: kafkaHeaderDeserializer
-        type: "#class:org.apache.camel.kamelets.utils.serialization.kafka.KafkaHeaderDeserializer"
+        type: "#class:org.apache.camel.component.kamelet.utils.serialization.kafka.KafkaHeaderDeserializer"
         properties:
           enabled: '{{deserializeHeaders}}'
     from:
diff --git a/connectors/camel-mongodb-changes-stream-source-kafka-connector/pom.xml b/connectors/camel-mongodb-changes-stream-source-kafka-connector/pom.xml
index 4eb77bf35b..a4bd89ef8f 100644
--- a/connectors/camel-mongodb-changes-stream-source-kafka-connector/pom.xml
+++ b/connectors/camel-mongodb-changes-stream-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-mongodb-changes-stream-source-kafka-connector/src/main/resources/kamelets/mongodb-changes-stream-source.kamelet.yaml b/connectors/camel-mongodb-changes-stream-source-kafka-connector/src/main/resources/kamelets/mongodb-changes-stream-source.kamelet.yaml
index 97379d5475..afe787842d 100644
--- a/connectors/camel-mongodb-changes-stream-source-kafka-connector/src/main/resources/kamelets/mongodb-changes-stream-source.kamelet.yaml
+++ b/connectors/camel-mongodb-changes-stream-source-kafka-connector/src/main/resources/kamelets/mongodb-changes-stream-source.kamelet.yaml
@@ -82,13 +82,12 @@ spec:
     - "camel:kamelet"
     - "camel:mongodb"
     - "camel:jackson"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
   template:
     beans:
       - name: local-mongodb
         type: "#class:org.apache.camel.component.mongodb.MongoDbComponent"
       - name: mongo-client
-        type: "#class:org.apache.camel.kamelets.utils.mongodb.SslAwareMongoClient"
+        type: "#class:org.apache.camel.component.kamelet.utils.mongodb.SslAwareMongoClient"
         properties:
           password: "{{?password}}"
           username: "{{?username}}"
diff --git a/connectors/camel-mongodb-sink-kafka-connector/pom.xml b/connectors/camel-mongodb-sink-kafka-connector/pom.xml
index 22a7942b11..877f195555 100644
--- a/connectors/camel-mongodb-sink-kafka-connector/pom.xml
+++ b/connectors/camel-mongodb-sink-kafka-connector/pom.xml
@@ -65,11 +65,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-mongodb-sink-kafka-connector/src/main/resources/kamelets/mongodb-sink.kamelet.yaml b/connectors/camel-mongodb-sink-kafka-connector/src/main/resources/kamelets/mongodb-sink.kamelet.yaml
index 3397007a29..dd48d00935 100644
--- a/connectors/camel-mongodb-sink-kafka-connector/src/main/resources/kamelets/mongodb-sink.kamelet.yaml
+++ b/connectors/camel-mongodb-sink-kafka-connector/src/main/resources/kamelets/mongodb-sink.kamelet.yaml
@@ -95,13 +95,12 @@ spec:
     - "camel:kamelet"
     - "camel:mongodb"
     - "camel:jackson"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
   template:
     beans:
       - name: local-mongodb
         type: "#class:org.apache.camel.component.mongodb.MongoDbComponent"
       - name: mongo-client
-        type: "#class:org.apache.camel.kamelets.utils.mongodb.SslAwareMongoClient"
+        type: "#class:org.apache.camel.component.kamelet.utils.mongodb.SslAwareMongoClient"
         properties:
           password: "{{?password}}"
           username: "{{?username}}"
diff --git a/connectors/camel-mongodb-source-kafka-connector/pom.xml b/connectors/camel-mongodb-source-kafka-connector/pom.xml
index 7ac3d7f38d..23ccf8d77a 100644
--- a/connectors/camel-mongodb-source-kafka-connector/pom.xml
+++ b/connectors/camel-mongodb-source-kafka-connector/pom.xml
@@ -61,11 +61,6 @@
       <groupId>org.apache.camel</groupId>
       <artifactId>camel-kamelet</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.camel.kamelets</groupId>
-      <artifactId>camel-kamelets-utils</artifactId>
-      <version>4.9.0-SNAPSHOT</version>
-    </dependency>
     <!--END OF GENERATED CODE-->
   </dependencies>
   <build>
diff --git a/connectors/camel-mongodb-source-kafka-connector/src/main/resources/kamelets/mongodb-source.kamelet.yaml b/connectors/camel-mongodb-source-kafka-connector/src/main/resources/kamelets/mongodb-source.kamelet.yaml
index 4c285f172c..626890e67e 100644
--- a/connectors/camel-mongodb-source-kafka-connector/src/main/resources/kamelets/mongodb-source.kamelet.yaml
+++ b/connectors/camel-mongodb-source-kafka-connector/src/main/resources/kamelets/mongodb-source.kamelet.yaml
@@ -92,13 +92,12 @@ spec:
     - "camel:kamelet"
     - "camel:mongodb"
     - "camel:jackson"
-    - "mvn:org.apache.camel.kamelets:camel-kamelets-utils:4.9.0-SNAPSHOT"
   template:
     beans:
       - name: local-mongodb
         type: "#class:org.apache.camel.component.mongodb.MongoDbComponent"
       - name: mongo-client
-        type: "#class:org.apache.camel.kamelets.utils.mongodb.SslAwareMongoClient"
+        type: "#class:org.apache.camel.component.kamelet.utils.mongodb.SslAwareMongoClient"
         properties:
           password: "{{?password}}"
           username: "{{?username}}"
diff --git a/connectors/camel-sftp-source-kafka-connector/src/main/resources/kamelets/sftp-source.kamelet.yaml b/connectors/camel-sftp-source-kafka-connector/src/main/resources/kamelets/sftp-source.kamelet.yaml
index 41e730239f..95d6d910b3 100644
--- a/connectors/camel-sftp-source-kafka-connector/src/main/resources/kamelets/sftp-source.kamelet.yaml
+++ b/connectors/camel-sftp-source-kafka-connector/src/main/resources/kamelets/sftp-source.kamelet.yaml
@@ -1,4 +1,4 @@
-# ---------------------------------------------------------------------------
+ # ---------------------------------------------------------------------------
 # 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.