[camel] branch main updated: camel-jbang - Export should include camel-yaml-dsl if using kamelets, eg if you use Java routes with kamelets then yaml-dsl was missing before. Thanks to Andrea for reporting this.

[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 34743298ad4 camel-jbang - Export should include camel-yaml-dsl if 
using kamelets, eg if you use Java routes with kamelets then yaml-dsl was 
missing before. Thanks to Andrea for reporting this.
34743298ad4 is described below

commit 34743298ad4fe64d9307baf2ec9297c78de04d84
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Aug 3 15:10:53 2022 +0200

    camel-jbang - Export should include camel-yaml-dsl if using kamelets, eg if 
you use Java routes with kamelets then yaml-dsl was missing before. Thanks to 
Andrea for reporting this.
---
 .../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java   | 8 +++++++-
 1 file changed, 7 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 fbea0d9650a..bf0e11c1cb9 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
@@ -163,13 +163,19 @@ abstract class ExportBaseCommand extends CamelCommand {
                     answer.add(v);
                 }
                 if (v != null && v.contains("org.apache.camel:camel-kamelet")) 
{
-                    // include kamelet catalog if we use kamelets
+                    // include yaml-dsl and kamelet catalog if we use kamelets
+                    answer.add("camel:yaml-dsl");
                     answer.add("org.apache.camel.kamelets:camel-kamelets:" + 
kameletsVersion);
                 }
             } else if (line.startsWith("camel.jbang.dependencies=")) {
                 String deps = StringHelper.after(line, 
"camel.jbang.dependencies=");
                 for (String d : deps.split(",")) {
                     answer.add(d.trim());
+                    if (d.contains("org.apache.camel:camel-kamelet")) {
+                        // include yaml-dsl and kamelet catalog if we use 
kamelets
+                        answer.add("camel:yaml-dsl");
+                        answer.add("org.apache.camel.kamelets:camel-kamelets:" 
+ kameletsVersion);
+                    }
                 }
             } else if (line.startsWith("camel.main.routesIncludePattern=")) {
                 String routes = StringHelper.after(line, 
"camel.main.routesIncludePattern=");