Fix examples to build and pass tests
diff --git a/README.adoc b/README.adoc
index f536ebc..95289f0 100644
--- a/README.adoc
+++ b/README.adoc
@@ -33,9 +33,9 @@
 |===
 | Example | Category | Description
 
-| link:camel-example-spring-boot-azure-eventhubs/README.adoc[Spring Boot Azure Eventhubs] (camel-example-spring-boot-azure-eventhubs) |  | An example showing how to work with Camel, Azure Event Hubs and Spring Boot
+| link:azure/camel-example-spring-boot-azure-eventhubs/README.adoc[Spring Boot Azure Eventhubs] (camel-example-spring-boot-azure-eventhubs) |  | An example showing how to work with Camel, Azure Event Hubs and Spring Boot
 
-| link:camel-example-spring-boot-azure-servicebus/README.adoc[Spring Boot Azure Servicebus] (camel-example-spring-boot-azure-servicebus) |  | An example showing how to work with Camel, Azure Service Bus and Spring Boot
+| link:azure/camel-example-spring-boot-azure-servicebus/README.adoc[Spring Boot Azure Servicebus] (camel-example-spring-boot-azure-servicebus) |  | An example showing how to work with Camel, Azure Service Bus and Spring Boot
 
 | link:mail-ms-exchange-oauth2/Readme.adoc[Mail Ms Exchange Oauth2] (mail-ms-exchange-oauth2) |  | An example showing how to use Camel on Spring Boot to connect
         with IMAP protocol and access email data for Office 365 users using OAuth2 authentication
diff --git a/fhir-auth-tx/pom.xml b/fhir-auth-tx/pom.xml
index d41f125..07dc052 100644
--- a/fhir-auth-tx/pom.xml
+++ b/fhir-auth-tx/pom.xml
@@ -103,8 +103,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-management</artifactId>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-management-starter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/fhir/pom.xml b/fhir/pom.xml
index 43cfb58..d36680f 100644
--- a/fhir/pom.xml
+++ b/fhir/pom.xml
@@ -102,8 +102,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-management</artifactId>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-management-starter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/health-checks/pom.xml b/health-checks/pom.xml
index 3e8cc25..11c3d3b 100644
--- a/health-checks/pom.xml
+++ b/health-checks/pom.xml
@@ -79,8 +79,8 @@
             <artifactId>camel-netty-starter</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-management</artifactId>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-management-starter</artifactId>
         </dependency>
     </dependencies>
 
diff --git a/kamelet-chucknorris/pom.xml b/kamelet-chucknorris/pom.xml
index 5ebd3a3..d86d684 100644
--- a/kamelet-chucknorris/pom.xml
+++ b/kamelet-chucknorris/pom.xml
@@ -67,6 +67,24 @@
             <artifactId>spring-boot-starter</artifactId>
         </dependency>
 
+        <!-- Spring Boot not yet upgraded to http client 5.2.x -->
+        <!-- TODO: this can be removed when SB works with 5.2.x -->
+        <dependency>
+            <groupId>org.apache.httpcomponents.client5</groupId>
+            <artifactId>httpclient5</artifactId>
+            <version>${httpclient-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
+            <version>${httpcore-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5-h2</artifactId>
+            <version>${httpcore-version}</version>
+        </dependency>
+
         <!-- Camel -->
         <dependency>
             <groupId>org.apache.camel.springboot</groupId>
diff --git a/route-reload/pom.xml b/route-reload/pom.xml
index 4710431..f654da6 100644
--- a/route-reload/pom.xml
+++ b/route-reload/pom.xml
@@ -98,8 +98,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-management</artifactId>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-management-starter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/routetemplate-xml/pom.xml b/routetemplate-xml/pom.xml
index d4a2e47..268d687 100644
--- a/routetemplate-xml/pom.xml
+++ b/routetemplate-xml/pom.xml
@@ -80,6 +80,11 @@
             <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-quartz-starter</artifactId>
         </dependency>
+        <!-- xml dsl -->
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-xml-io-dsl-starter</artifactId>
+        </dependency>
 
         <!-- test -->
         <dependency>
diff --git a/routetemplate/pom.xml b/routetemplate/pom.xml
index 5fb528a..eb1cc0f 100644
--- a/routetemplate/pom.xml
+++ b/routetemplate/pom.xml
@@ -80,6 +80,11 @@
             <groupId>org.apache.camel.springboot</groupId>
             <artifactId>camel-quartz-starter</artifactId>
         </dependency>
+        <!-- xml dsl -->
+        <dependency>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-xml-io-dsl-starter</artifactId>
+        </dependency>
 
         <!-- test -->
         <dependency>
diff --git a/validator/pom.xml b/validator/pom.xml
index c464dc3..9e99c14 100644
--- a/validator/pom.xml
+++ b/validator/pom.xml
@@ -94,8 +94,8 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.apache.camel</groupId>
-            <artifactId>camel-management</artifactId>
+            <groupId>org.apache.camel.springboot</groupId>
+            <artifactId>camel-management-starter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>