This is an automated email from the ASF dual-hosted git repository.
Croway pushed a commit to branch camel-4.22.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.22.x by this push:
new 5966b14621ac chore: upgrade Hawtio to 5.2.1
5966b14621ac is described below
commit 5966b14621ac975c09993cca25a1b34d7ff2ffba
Author: Croway <[email protected]>
AuthorDate: Thu Sep 3 13:26:06 2026 +0200
chore: upgrade Hawtio to 5.2.1
---
.../camel/dsl/jbang/core/commands/ExportSpringBoot.java | 3 ++-
.../camel/dsl/jbang/core/commands/ExportTest.java | 17 ++++++++++++++++-
parent/pom.xml | 2 +-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
index ecb772df57e9..2b35bd58d69c 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportSpringBoot.java
@@ -421,7 +421,8 @@ class ExportSpringBoot extends Export {
}
if (hawtio) {
answer.add("mvn:org.apache.camel:camel-management");
- answer.add("mvn:io.hawt:hawtio-springboot:" + hawtioVersion);
+ String hawtioArtifact = springBootVersion.startsWith("4.") ?
"hawtio-springboot4" : "hawtio-springboot";
+ answer.add("mvn:io.hawt:" + hawtioArtifact + ":" + hawtioVersion);
}
return answer;
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
index 45b4eca08aac..01b7780a1cea 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportTest.java
@@ -1018,7 +1018,7 @@ class ExportTest {
null));
Assertions.assertTrue(
containsDependency(model.getDependencies(), "io.hawt",
- "hawtio-springboot",
HawtioVersion.HAWTIO_VERSION));
+ "hawtio-springboot4",
HawtioVersion.HAWTIO_VERSION));
// Application properties
File appProperties = new File(workingDir + "/src/main/resources",
"application.properties");
String content = IOHelper.loadText(new
FileInputStream(appProperties));
@@ -1042,6 +1042,21 @@ class ExportTest {
}
}
+ @Test
+ public void shouldExportHawtioWithSpringBoot3() throws Exception {
+ LOG.info("shouldExportHawtioWithSpringBoot3");
+ Export command = new Export(new CamelJBangMain());
+ CommandLine.populateCommand(command, "--gav=examples:route:1.0.0",
"--dir=" + workingDir,
+ "--runtime=spring-boot", "--camel-version=" +
RELEASED_CAMEL_VERSION,
+ "--spring-boot-version=3.5.14", "--hawtio=true",
"target/test-classes/route.yaml");
+ int exit = command.doCall();
+
+ Assertions.assertEquals(0, exit);
+ Model model = readMavenModel();
+ Assertions.assertTrue(containsDependency(model.getDependencies(),
"io.hawt",
+ "hawtio-springboot", HawtioVersion.HAWTIO_VERSION));
+ }
+
@ParameterizedTest
@MethodSource("runtimeProvider")
public void shouldExportWithParentPom(RuntimeType rt) throws Exception {
diff --git a/parent/pom.xml b/parent/pom.xml
index ce0c8917b910..0df74257b40a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -219,7 +219,7 @@
<hapi-base-version>2.6.0</hapi-base-version>
<hapi-fhir-version>8.10.1</hapi-fhir-version>
<hapi-fhir-core-version>6.10.0</hapi-fhir-core-version>
- <hawtio-version>4.6.2</hawtio-version>
+ <hawtio-version>5.2.1</hawtio-version>
<!-- https://issues.apache.org/jira/browse/CAMEL-22041
hazelcast needs to stay at 5.4.0 for 4.19.0 due to changes where
the CP subsystem is only available in
the enterprise hazelcast product -->
