(camel) 01/01: CAMEL-21372: camel-jbang - Fix NPE in run/export with custom camel version (not ASF build)

[davsclaus]

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

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

commit a5cc1224a8c79160c409821369efd249202f9ed3
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Oct 23 14:47:31 2024 +0200

    CAMEL-21372: camel-jbang - Fix NPE in run/export with custom camel version 
(not ASF build)
---
 .../org/apache/camel/dsl/jbang/core/commands/Run.java  | 18 ++++++++++++------
 1 file changed, 12 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 f62b6ce6330..c4b2b18a8b0 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
@@ -1287,17 +1287,17 @@ public class Run extends CamelCommand {
         sb.append(String.format("//DEPS org.apache.camel:camel-main:%s%n", 
camelVersion));
         sb.append(String.format("//DEPS 
org.apache.camel:camel-java-joor-dsl:%s%n", camelVersion));
         sb.append(String.format("//DEPS org.apache.camel:camel-kamelet:%s%n", 
camelVersion));
+        sb.append(String.format("//DEPS 
org.apache.camel:camel-kamelet-main:%s%n", camelVersion));
+        if (VersionHelper.isGE(camelVersion, "3.19.0")) {
+            sb.append(String.format("//DEPS 
org.apache.camel:camel-cli-connector:%s%n", camelVersion));
+        }
         content = content.replaceFirst("\\{\\{ \\.CamelDependencies }}", 
sb.toString());
 
-        // use apache distribution of camel-jbang
+        // use apache distribution of camel-jbang/github-resolver
         String v = camelVersion.substring(0, camelVersion.lastIndexOf('.'));
         sb = new StringBuilder();
         sb.append(String.format("//DEPS 
org.apache.camel:camel-jbang-core:%s%n", v));
-        sb.append(String.format("//DEPS 
org.apache.camel:camel-kamelet-main:%s%n", v));
         sb.append(String.format("//DEPS 
org.apache.camel:camel-resourceresolver-github:%s%n", v));
-        if (VersionHelper.isGE(v, "3.19.0")) {
-            sb.append(String.format("//DEPS 
org.apache.camel:camel-cli-connector:%s%n", v));
-        }
         content = content.replaceFirst("\\{\\{ \\.CamelJBangDependencies }}", 
sb.toString());
 
         sb = new StringBuilder();
@@ -1307,7 +1307,13 @@ public class Run extends CamelCommand {
         String fn = CommandLineHelper.CAMEL_JBANG_WORK_DIR + 
"/CustomCamelJBang.java";
         Files.writeString(Paths.get(fn), content);
 
-        List<String> cmds = new 
ArrayList<>(spec.commandLine().getParseResult().originalArgs());
+        List<String> cmds;
+        if (spec != null) {
+            cmds = new 
ArrayList<>(spec.commandLine().getParseResult().originalArgs());
+        } else {
+            cmds = new ArrayList<>();
+            cmds.add("run");
+        }
 
         if (background) {
             cmds.remove("--background=true");