[camel] branch camel-3.18.x updated: camel-jbang - Run should merge --deps with existing dependencies that may be specified in application.properties

[davsclaus]

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

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


The following commit(s) were added to refs/heads/camel-3.18.x by this push:
     new af535291ff8 camel-jbang - Run should merge --deps with existing 
dependencies that may be specified in application.properties
af535291ff8 is described below

commit af535291ff884b0d990301eca84e35e88bdf34b4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Mon Nov 7 21:02:12 2022 +0100

    camel-jbang - Run should merge --deps with existing dependencies that may 
be specified in application.properties
---
 .../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java     | 1 +
 .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

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 862c996445f..77d108fbb2e 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
@@ -154,6 +154,7 @@ abstract class ExportBaseCommand extends CamelCommand {
         // need to declare the profile to use for run
         run.profile = profile;
         run.localKameletDir = localKameletDir;
+        run.dependencies = dependencies;
         Integer code = run.runSilent();
         return code;
     }
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 350bddfcc2d..98767950eb3 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
@@ -379,7 +379,7 @@ class Run extends CamelCommand {
         String dep = profileProperties != null ? 
profileProperties.getProperty("camel.jbang.dependencies") : null;
         if (dep == null) {
             dep = dependencies;
-        } else {
+        } else if (dependencies != null && !dependencies.equals(dep)) {
             dep += "," + dependencies;
         }
         if (dep != null) {