[camel] branch main updated: CAMEL-18424: camel-jbang - Dependency downloaded issue with camel-aws-s3

[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 c2ba921b69e CAMEL-18424: camel-jbang - Dependency downloaded issue 
with camel-aws-s3
c2ba921b69e is described below

commit c2ba921b69ed61026d4d45a3abf8c95e354cbf67
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Wed Aug 24 11:23:26 2022 +0200

    CAMEL-18424: camel-jbang - Dependency downloaded issue with camel-aws-s3
---
 .../apache/camel/main/download/MavenDependencyDownloader.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

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 46c5c4f03fe..7c7933dd490 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
@@ -32,6 +32,7 @@ import org.apache.camel.CamelContext;
 import org.apache.camel.CamelContextAware;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.support.service.ServiceSupport;
+import org.apache.camel.util.FileUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -244,10 +245,16 @@ public class MavenDependencyDownloader extends 
ServiceSupport implements Depende
         }
 
         if (classLoader instanceof URLClassLoader) {
+            // create path like target to match against the file url
+            String urlTarget = groupId + "/" + artifactId;
+            urlTarget = urlTarget.replace('.', '/');
+            urlTarget += "/" + version + "/" + target + ".jar";
+            urlTarget = FileUtil.normalizePath(urlTarget); // windows vs linux
             URLClassLoader ucl = (URLClassLoader) classLoader;
             for (URL u : ucl.getURLs()) {
                 String s = u.toString();
-                if (s.contains(target)) {
+                s = FileUtil.normalizePath(s);
+                if (s.contains(urlTarget)) {
                     // trigger listener
                     if (listener) {
                         for (DownloadListener dl : downloadListeners) {