From 4ef95ea3ba49b7523b874ba20f27aba249f30c7c Mon Sep 17 00:00:00 2001 From: Vilmos Nagy Date: Mon, 27 Apr 2026 23:33:33 +0200 Subject: [PATCH] CAMEL-23370 fix `camel.main.routes-include-pattern` usage with multi-level wildcard matchers in springboot jars Using `classpath:**/*.xml` (like any xml in any dir) was broken since _probably_ CAMEL-21944 --- .../support/scan/DefaultPackageScanResourceResolver.java | 2 +- .../apache/camel/support/scan/PackageScanJarResource.java | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/camel-support/src/main/java/org/apache/camel/support/scan/DefaultPackageScanResourceResolver.java b/core/camel-support/src/main/java/org/apache/camel/support/scan/DefaultPackageScanResourceResolver.java index a9a4c601aeb04..8857eeca9978e 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/scan/DefaultPackageScanResourceResolver.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/scan/DefaultPackageScanResourceResolver.java @@ -216,7 +216,7 @@ protected void loadImplementationsInJar( boolean match = PATH_MATCHER.match(subPattern, shortName); LOG.debug("Found resource: {} matching pattern: {} -> {}", shortName, subPattern, match); if (match) { - Resource resource = new PackageScanJarResource("jar", url, name); + Resource resource = new PackageScanJarResource("jar", url, shortName); resources.add(resource); } } diff --git a/core/camel-support/src/main/java/org/apache/camel/support/scan/PackageScanJarResource.java b/core/camel-support/src/main/java/org/apache/camel/support/scan/PackageScanJarResource.java index 6110920a9191c..ac063c4bd3a8c 100644 --- a/core/camel-support/src/main/java/org/apache/camel/support/scan/PackageScanJarResource.java +++ b/core/camel-support/src/main/java/org/apache/camel/support/scan/PackageScanJarResource.java @@ -25,7 +25,6 @@ import java.net.URLClassLoader; import org.apache.camel.support.ResourceSupport; -import org.apache.camel.util.FileUtil; import org.apache.camel.util.StringHelper; public class PackageScanJarResource extends ResourceSupport { @@ -33,8 +32,8 @@ public class PackageScanJarResource extends ResourceSupport { private final URL url; private final URLClassLoader uc; - public PackageScanJarResource(String scheme, URL url, String location) { - super(scheme, url.getFile() + FileUtil.stripPath(location)); + public PackageScanJarResource(String scheme, URL url, String shortName) { + super(scheme, url.getFile() + shortName); this.url = url; this.uc = new URLClassLoader(new URL[] { url }); }