(camel) branch main updated: CAMEL-21004: camel-jbang export does not use runtime from application.properties

[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 d0008cf1760 CAMEL-21004: camel-jbang export does not use runtime from 
application.properties
d0008cf1760 is described below

commit d0008cf1760d82a63132f6757feb948b49904c6d
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Aug 5 17:59:21 2024 +0200

    CAMEL-21004: camel-jbang export does not use runtime from 
application.properties
---
 .../main/java/org/apache/camel/dsl/jbang/core/commands/Export.java   | 5 +++--
 .../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java  | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
index 59cd20d0323..70adc51d5df 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Export.java
@@ -77,8 +77,9 @@ public class Export extends ExportBaseCommand {
             Properties props = new CamelCaseOrderedProperties();
             RuntimeUtil.loadProperties(props, file);
             // read runtime and gav from profile if not configured
-            if (props.containsKey("camel.jbang.runtime")) {
-                this.runtime = 
RuntimeType.fromValue(props.getProperty("camel.jbang.runtime"));
+            String rt = props.getProperty("camel.jbang.runtime");
+            if (rt != null) {
+                this.runtime = RuntimeType.fromValue(rt);
             }
             this.gav = props.getProperty("camel.jbang.gav", this.gav);
             // allow configuring versions from profile
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index 14094d44283..af1af3effc8 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -301,6 +301,7 @@ public abstract class ExportBaseCommand extends 
CamelCommand {
         run.excludes = excludes;
         run.openapi = openapi;
         run.download = download;
+        run.runtime = runtime;
         run.camelVersion = camelVersion;
         run.quarkusVersion = quarkusVersion;
         run.springBootVersion = springBootVersion;