From a54cab39a793eea1dcea1f4b5bf5721069d647d0 Mon Sep 17 00:00:00 2001
From: Tom Cunningham <tcunning@redhat.com>
Date: Mon, 23 Feb 2026 12:44:18 -0500
Subject: [PATCH 1/2] Add dependency on spring-boot-actuator-autoconfigure
 (https://github.com/jolokia/jolokia/issues/978)

---
 components-starter/camel-jolokia-starter/pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/components-starter/camel-jolokia-starter/pom.xml b/components-starter/camel-jolokia-starter/pom.xml
index 8ba091318ad..0b7142e2abf 100644
--- a/components-starter/camel-jolokia-starter/pom.xml
+++ b/components-starter/camel-jolokia-starter/pom.xml
@@ -36,9 +36,16 @@
     </dependency>
     <dependency>
       <groupId>org.jolokia</groupId>
-      <artifactId>jolokia-support-springboot3</artifactId>
+      <artifactId>jolokia-support-springboot</artifactId>
       <version>${jolokia-version}</version>
     </dependency>
+    <!-- Required for Jolokia Spring Boot 4 support - Jolokia 2.5.x has this as 'provided' scope -->
+    <!-- See: https://github.com/jolokia/jolokia/issues/978 -->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+      <version>${spring-boot-version}</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.camel.springboot</groupId>
       <artifactId>camel-management-starter</artifactId>

From f07f451fb9fd7960d33bbc366d2329f6f82b9bda Mon Sep 17 00:00:00 2001
From: Tom Cunningham <tcunning@redhat.com>
Date: Mon, 23 Feb 2026 12:46:15 -0500
Subject: [PATCH 2/2] Change groupId on undertow-servlet to match undertow 2.4

---
 components-starter/camel-undertow-starter/pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components-starter/camel-undertow-starter/pom.xml b/components-starter/camel-undertow-starter/pom.xml
index 30d2928f469..cccf9da8013 100644
--- a/components-starter/camel-undertow-starter/pom.xml
+++ b/components-starter/camel-undertow-starter/pom.xml
@@ -40,9 +40,9 @@
       <version>${camel-version}</version>
     </dependency>
     <dependency>
-      <groupId>io.undertow</groupId>
+      <groupId>io.undertow.ee</groupId>
       <artifactId>undertow-servlet</artifactId>
-      <version>${undertow-version}</version>
+      <version>${undertow-ee-version}</version>
     </dependency>
     <!--START OF GENERATED CODE-->
     <dependency>