(camel) branch main updated: camel-jbang - Upgrade to hawtio 4.2.0 and polished

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 4aff148416a camel-jbang - Upgrade to hawtio 4.2.0 and polished
4aff148416a is described below

commit 4aff148416a5112835229070703302ede99de9b7
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Nov 13 08:03:29 2024 +0100

    camel-jbang - Upgrade to hawtio 4.2.0 and polished
---
 .../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java   | 8 +++++---
 .../org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java  | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
index 8b9ab159801..daa8bfcc048 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java
@@ -264,7 +264,7 @@ public class Run extends CamelCommand {
             description = "Local directory (or github link) for loading 
Kamelets (takes precedence). Multiple directories can be specified separated by 
comma.")
     String localKameletDir;
 
-    @Option(names = { "--port" }, description = "Embeds a local HTTP server on 
this port")
+    @Option(names = { "--port" }, description = "Embeds a local HTTP server on 
this port", defaultValue = "8080")
     int port;
 
     @Option(names = { "--console" }, description = "Developer console at 
/q/dev on local HTTP server (port 8080 by default)")
@@ -558,7 +558,9 @@ public class Run extends CamelCommand {
             writeSetting(main, profileProperties, "camel.jbang.gav", gav);
         }
         writeSetting(main, profileProperties, "camel.jbang.open-api", openapi);
-        writeSetting(main, profileProperties, "camel.jbang.repos", 
String.join(",", repositories));
+        if (repositories != null) {
+            writeSetting(main, profileProperties, "camel.jbang.repos", 
String.join(",", repositories));
+        }
         writeSetting(main, profileProperties, "camel.jbang.health", health ? 
"true" : "false");
         writeSetting(main, profileProperties, "camel.jbang.metrics", metrics ? 
"true" : "false");
         writeSetting(main, profileProperties, "camel.jbang.console", console ? 
"true" : "false");
@@ -616,7 +618,7 @@ public class Run extends CamelCommand {
         writeSetting(main, profileProperties, 
"camel.main.durationMaxIdleSeconds",
                 () -> maxIdleSeconds > 0 ? String.valueOf(maxIdleSeconds) : 
null);
         writeSetting(main, profileProperties, "camel.jbang.platform-http.port",
-                () -> port > 0 ? String.valueOf(port) : null);
+                () -> port > 0 && port != 8080 ? String.valueOf(port) : null);
         writeSetting(main, profileProperties, "camel.jbang.jfr", jfr || 
jfrProfile != null ? "jfr" : null); // TODO: "true" instead of "jfr" ?
         writeSetting(main, profileProperties, "camel.jbang.jfr-profile", 
jfrProfile != null ? jfrProfile : null);
 
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
index ef4926cef37..3c0b344684d 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
@@ -37,8 +37,8 @@ public class Hawtio extends CamelCommand {
     String name;
 
     @CommandLine.Option(names = { "--version" },
-                        description = "Version of the Hawtio web console", 
defaultValue = "4.1.0")
-    String version = "4.1.0";
+                        description = "Version of the Hawtio web console", 
defaultValue = "4.2.0")
+    String version = "4.2.0";
 
     // use port 8888 as 8080 is too commonly used
     @CommandLine.Option(names = { "--port" },
@@ -147,7 +147,7 @@ public class Hawtio extends CamelCommand {
             System.err.println("Cannot launch Hawtio due to: " + 
e.getMessage());
             return 1;
         } finally {
-            downloader.stop();
+            downloader.close();
         }
 
         return 0;