You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2025/02/19 10:29:58 UTC
(camel) branch camel-4.8.x updated: CAMEL-21730: JBang export cannot validate route that depends on copied resources (#17191)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.8.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.8.x by this push:
new 8cfbb94908d CAMEL-21730: JBang export cannot validate route that depends on copied resources (#17191)
8cfbb94908d is described below
commit 8cfbb94908d8ce7ee747223df16fd705955fdbaa
Author: Thomas Diesler <td...@redhat.com>
AuthorDate: Wed Feb 19 11:29:51 2025 +0100
CAMEL-21730: JBang export cannot validate route that depends on copied resources (#17191)
---
.../java/org/apache/camel/dsl/jbang/core/commands/Run.java | 11 ++++++++++-
.../dsl/jbang/core/commands/kubernetes/KubernetesRun.java | 2 +-
2 files changed, 11 insertions(+), 2 deletions(-)
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 d1dd00c91a7..6b1ac4f8334 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
@@ -38,6 +38,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import org.apache.camel.FailedToCreateRouteException;
import org.apache.camel.catalog.CamelCatalog;
import org.apache.camel.catalog.DefaultCamelCatalog;
import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
@@ -865,7 +866,15 @@ public class Run extends CamelCommand {
return runBackground(main);
} else {
// run default in current JVM with same camel version
- return runKameletMain(main);
+ try {
+ return runKameletMain(main);
+ } catch (FailedToCreateRouteException ex) {
+ if (ignoreLoadingError) {
+ printer().printErr(ex);
+ return 0;
+ }
+ throw ex;
+ }
}
}
diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
index a0c877541ed..6aee3d901cc 100644
--- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
+++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRun.java
@@ -361,7 +361,7 @@ public class KubernetesRun extends KubernetesBaseCommand {
buildProperties,
true,
false,
- false,
+ true,
true,
false,
true,