[camel] branch main 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 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 9681e03912d camel-jbang - Run should merge --deps with existing 
dependencies that may be specified in application.properties
9681e03912d is described below

commit 9681e03912d94a6e00d78f1a75fd8cf00806ac05
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 ed57a35fb39..25a93183df2 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
@@ -166,6 +166,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 e38ed10559b..aede235c11d 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
@@ -354,7 +354,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) {