This is an automated email from the ASF dual-hosted git repository.
fmariani 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 a4af9df7177 Camel Jbang run ignore "--repos" option + handle camel
spring boot version in run
a4af9df7177 is described below
commit a4af9df71773cc9c721987be1ddfd808634df95f
Author: Croway <[email protected]>
AuthorDate: Fri Jan 24 17:04:12 2025 +0100
Camel Jbang run ignore "--repos" option + handle camel spring boot version
in run
---
.../apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 2 ++
.../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 7 ++++++-
2 files changed, 8 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 d081c11cddf..980615026d0 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
@@ -326,6 +326,7 @@ 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;
@@ -333,6 +334,7 @@ public abstract class ExportBaseCommand extends
CamelCommand {
run.ignoreLoadingError = ignoreLoadingError;
run.lazyBean = lazyBean;
run.property = applicationProperties;
+ 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 057810c7d92..0da7a368fe7 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
@@ -144,6 +144,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;
@@ -997,7 +1001,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;
@@ -1006,6 +1010,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";