This is an automated email from the ASF dual-hosted git repository.
fmariani 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 24dde2d004d Camel Jbang run ignore "--repos" option + handle camel
spring boot ve…
24dde2d004d is described below
commit 24dde2d004d5d5d5aa551d823a5ddd9b74eaf7da
Author: Croway <[email protected]>
AuthorDate: Fri Jan 24 17:19:25 2025 +0100
Camel Jbang run ignore "--repos" option + handle camel spring boot ve…
---
.../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 3 +++
.../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 7 ++++++-
2 files changed, 9 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 f9a7235cf08..41bccd36ed4 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
@@ -314,11 +314,14 @@ public abstract class ExportBaseCommand extends
CamelCommand {
run.download = download;
run.runtime = runtime;
run.camelVersion = camelVersion;
+ run.camelSpringBootVersion = camelSpringBootVersion;
run.quarkusVersion = quarkusVersion;
run.springBootVersion = springBootVersion;
run.kameletsVersion = kameletsVersion;
run.localKameletDir = localKameletDir;
run.ignoreLoadingError = ignoreLoadingError;
+ run.repositories = repositories;
+
return run.runExport(ignoreLoadingError);
}
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 1bb879b05da..9f050c8c14f 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
@@ -134,6 +134,10 @@ public class Run extends CamelCommand {
@Option(names = { "--camel-version" }, description = "To run using a
different Camel version than the default version.")
String camelVersion;
+ @Option(names = { "--camel-spring-boot-version" },
+ description = "To run using a different Camel Spring Boot version
than the default version.")
+ String camelSpringBootVersion;
+
@Option(names = { "--kamelets-version" }, description = "Apache Camel
Kamelets version")
String kameletsVersion;
@@ -962,7 +966,7 @@ public class Run extends CamelCommand {
eq.gradleWrapper = false;
eq.springBootVersion = this.springBootVersion;
eq.camelVersion = this.camelVersion;
- eq.camelSpringBootVersion = this.camelVersion;
+ eq.camelSpringBootVersion = this.camelSpringBootVersion != null ?
this.camelSpringBootVersion : this.camelVersion;
eq.kameletsVersion = this.kameletsVersion;
eq.exportDir = runDir.toString();
eq.localKameletDir = this.localKameletDir;
@@ -971,6 +975,7 @@ public class Run extends CamelCommand {
eq.files = this.files;
eq.name = this.name;
eq.gav = this.gav;
+ eq.repositories = this.repositories;
if (eq.gav == null) {
if (eq.name == null) {
eq.name = "jbang-run-dummy";