(camel) branch camel-4.8.x updated: CAMEL-21283: Fix NPE when camel jbang starup due to this change

[davsclaus]

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

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


The following commit(s) were added to refs/heads/camel-4.8.x by this push:
     new fec217b749e CAMEL-21283: Fix NPE when camel jbang starup due to this 
change
fec217b749e is described below

commit fec217b749ea8dde472cdfc25a5aecd684563bdf
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Sep 30 10:49:59 2024 +0200

    CAMEL-21283: Fix NPE when camel jbang starup due to this change
---
 .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 6 ++++--
 .../org/apache/camel/main/download/MavenDependencyDownloader.java   | 2 +-
 .../java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java    | 2 +-
 3 files changed, 6 insertions(+), 4 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 7b8c4131d76..c49b4d4b46f 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
@@ -483,7 +483,9 @@ public class Run extends CamelCommand {
 
         final KameletMain main = createMainInstance();
         main.setProfile(profile);
-        main.setRepositories(String.join(",", repositories));
+        if (repositories != null && !repositories.isBlank()) {
+            main.setRepositories(String.join(",", repositories));
+        }
         main.setDownload(download);
         main.setFresh(fresh);
         main.setMavenSettings(mavenSettings);
@@ -540,7 +542,7 @@ 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.repositories", 
String.join(",", repositories));
+        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");
diff --git 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
index 8b6105e3d52..07c63a97214 100644
--- 
a/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
+++ 
b/dsl/camel-kamelet-main/src/main/java/org/apache/camel/main/download/MavenDependencyDownloader.java
@@ -77,7 +77,7 @@ public class MavenDependencyDownloader extends ServiceSupport 
implements Depende
     // all maven-resolver work is delegated to camel-tooling-maven
     private MavenDownloader mavenDownloader;
 
-    // repository URLs set from "camel.jbang.repositories" property or 
--repository option.
+    // repository URLs set from "camel.jbang.repos" property or --repos option.
     private String repositories;
     private boolean fresh;
 
diff --git 
a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
 
b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
index 3b11d4b0b5a..a0c8cde9ffc 100644
--- 
a/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
+++ 
b/tooling/camel-tooling-maven/src/main/java/org/apache/camel/tooling/maven/MavenDownloaderImpl.java
@@ -1168,7 +1168,7 @@ public class MavenDownloaderImpl extends ServiceSupport 
implements MavenDownload
 
     /**
      * <p>
-     * Using the passed ({@code --repos} parameter or {@code 
camel.jbang.repositories} option) and configured (in Maven
+     * Using the passed ({@code --repos} parameter or {@code 
camel.jbang.repos} option) and configured (in Maven
      * settings) repository locations, prepare a list of {@link 
RemoteRepository remote repositories} to be used during
      * Maven resolution. These repositories are <b>not yet</b> 
mirrored/proxied. Use
      * {@link RepositorySystem#newResolutionRepositories} first.