From fae62d40c4e7e96ae8e8007d27a18018cee709a0 Mon Sep 17 00:00:00 2001
From: Tom Cunningham <tcunning@redhat.com>
Date: Mon, 18 May 2026 21:44:20 -0400
Subject: [PATCH 1/2] Change camel version to 4.21.0-SNAPSHOT

---
 pom.xml                                                       | 4 ++--
 .../{ => src/test/resources-filtered}/jbang.properties        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/camel-kamelets-itest/{ => src/test/resources-filtered}/jbang.properties (87%)

diff --git a/pom.xml b/pom.xml
index 2e85986fc..599a74cbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.apache.camel</groupId>
         <artifactId>camel-dependencies</artifactId>
-        <version>4.20.0</version>
+        <version>4.21.0-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.camel.kamelets</groupId>
@@ -73,7 +73,7 @@
         <apache-rat-plugin.version>0.18</apache-rat-plugin.version>
         <cyclonedx-maven-plugin-version>2.9.1</cyclonedx-maven-plugin-version>
 
-        <camel.version>4.20.0</camel.version>
+        <camel.version>4.21.0-SNAPSHOT</camel.version>
 
         <citrus.version>4.10.1</citrus.version>
         <jose4j.version>0.9.6</jose4j.version>
diff --git a/tests/camel-kamelets-itest/jbang.properties b/tests/camel-kamelets-itest/src/test/resources-filtered/jbang.properties
similarity index 87%
rename from tests/camel-kamelets-itest/jbang.properties
rename to tests/camel-kamelets-itest/src/test/resources-filtered/jbang.properties
index ea06420f1..caab22cef 100644
--- a/tests/camel-kamelets-itest/jbang.properties
+++ b/tests/camel-kamelets-itest/src/test/resources-filtered/jbang.properties
@@ -16,5 +16,5 @@
 #
 
 # Declare required additional dependencies
-run.deps=org.apache.camel:camel-jackson-avro:4.14.0,\
-org.apache.camel:camel-jackson-protobuf:4.14.0
+run.deps=org.apache.camel:camel-jackson-avro:${camel.version},\
+org.apache.camel:camel-jackson-protobuf:${camel.version}

From 0e8bc56693cb0f49868f9baca8aedbbc83b949dd Mon Sep 17 00:00:00 2001
From: Tom Cunningham <tcunning@redhat.com>
Date: Tue, 19 May 2026 08:28:07 -0400
Subject: [PATCH 2/2] Change header counts to match 4.21.0-SNAPSHOT component
 changes

---
 .../camel/kamelets/catalog/KameletsCatalogTest.java    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 8ab835fcd..811085e03 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
@@ -162,9 +162,9 @@ void testSupportedHeaders() throws Exception {
         verifyHeaders("azure-eventhubs-sink", 2);
         verifyHeaders("azure-functions-sink", 8);
         verifyHeaders("azure-servicebus-source", 21);
-        verifyHeaders("azure-storage-blob-source", 35);
-        verifyHeaders("azure-storage-blob-sink", 38);
-        verifyHeaders("azure-storage-blob-changefeed-source", 35);
+        verifyHeaders("azure-storage-blob-source", 39);
+        verifyHeaders("azure-storage-blob-sink", 46);
+        verifyHeaders("azure-storage-blob-changefeed-source", 39);
         verifyHeaders("azure-storage-datalake-source", 25);
         verifyHeaders("azure-storage-datalake-sink", 37);
         verifyHeaders("azure-storage-queue-source", 6);
@@ -235,7 +235,7 @@ void testSupportedHeaders() throws Exception {
         verifyHeaders("mysql-sink", 9);
         verifyHeaders("mysql-source", 0);
         verifyHeaders("nats-sink", 5);
-        verifyHeaders("nats-source", 8);
+        verifyHeaders("nats-source", 9);
         verifyHeaders("oracle-database-sink", 9);
         verifyHeaders("oracle-database-source", 0);
         verifyHeaders("postgresql-sink", 9);
@@ -249,7 +249,7 @@ void testSupportedHeaders() throws Exception {
         verifyHeaders("salesforce-delete-sink", 1);
         verifyHeaders("salesforce-update-sink", 1);
         verifyHeaders("salesforce-composite-upsert-sink", 1);
-        verifyHeaders("salesforce-source", 21);
+        verifyHeaders("salesforce-source", 22);
         verifyHeaders("scp-sink", 0);
         verifyHeaders("sftp-sink", 6);
         verifyHeaders("sftp-source", 15);