[camel] branch main updated: camel-jbang - Custom dependencies without version is included in export

[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 aa8f45d78b9 camel-jbang - Custom dependencies without version is 
included in export
aa8f45d78b9 is described below

commit aa8f45d78b901aa93951a39c5154777ca410decf
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 17 08:58:09 2022 +0200

    camel-jbang - Custom dependencies without version is included in export
---
 .../java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java    | 5 +++++
 .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java  | 5 ++++-
 .../org/apache/camel/main/download/MavenDependencyDownloader.java    | 5 +++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
index e255589cea2..22324345db4 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/BaseExport.java
@@ -138,6 +138,11 @@ abstract class BaseExport extends CamelCommand {
                     // include kamelet catalog if we use kamelets
                     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());
+                }
             }
         }
 
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 7357e8ef598..bf040f80404 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
@@ -325,7 +325,10 @@ class Run extends CamelCommand {
         main.setDownloadListener(new DownloadListener() {
             @Override
             public void onDownloadDependency(String groupId, String 
artifactId, String version) {
-                String line = "mvn:" + groupId + ":" + artifactId + ":" + 
version;
+                String line = "mvn:" + groupId + ":" + artifactId;
+                if (version != null) {
+                    line += ":" + version;
+                }
                 if (!downloaded.contains(line)) {
                     writeSettings("dependency", line);
                     downloaded.add(line);
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 2606a5d45ff..79dee6c4886 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
@@ -109,6 +109,11 @@ public class MavenDependencyDownloader extends 
ServiceSupport implements Depende
             }
         }
 
+        // we need version to be able to download from maven
+        if (version == null) {
+            return;
+        }
+
         String gav = groupId + ":" + artifactId + ":" + version;
         threadPool.download(LOG, () -> {
             LOG.debug("Downloading: {}", gav);