[camel] branch main updated: CAMEL-19283: camel-jbang - Do not load camel version from application.properties as this is not consistent with older releases to change version.

2023-04-21 Thread 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 b34ec583d91 CAMEL-19283: camel-jbang - Do not load camel version from 
application.properties as this is not consistent with older releases to change 
version.
b34ec583d91 is described below

commit b34ec583d91da77029077c6e95d18da408d89c1a
Author: Claus Ibsen 
AuthorDate: Fri Apr 21 10:01:19 2023 +0200

CAMEL-19283: camel-jbang - Do not load camel version from 
application.properties as this is not consistent with older releases to change 
version.
---
 .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java  | 1 +
 1 file changed, 1 insertion(+)

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 0238e3c6d2a..0e18d1ff481 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
@@ -600,6 +600,7 @@ public class Run extends CamelCommand {
 openapi = answer.getProperty("camel.jbang.open-api", openapi);
 download = 
"true".equals(answer.getProperty("camel.jbang.download", download ? "true" : 
"false"));
 background = 
"true".equals(answer.getProperty("camel.jbang.background", background ? "true" 
: "false"));
+camelVersion = answer.getProperty("camel.jbang.camel-version", 
camelVersion);
 }
 return answer;
 }

[camel] branch main updated: CAMEL-19283: camel-jbang - Do not load camel version from application.properties as this is not consistent with older releases to change version.

2023-04-21 Thread 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 746b6660df8 CAMEL-19283: camel-jbang - Do not load camel version from 
application.properties as this is not consistent with older releases to change 
version.
746b6660df8 is described below

commit 746b6660df857266fc5bbb8557e4f1a39db18558
Author: Claus Ibsen 
AuthorDate: Fri Apr 21 09:55:49 2023 +0200

CAMEL-19283: camel-jbang - Do not load camel version from 
application.properties as this is not consistent with older releases to change 
version.
---
 docs/user-manual/modules/ROOT/pages/camel-jbang.adoc   | 3 ---
 .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java| 1 -
 2 files changed, 4 deletions(-)

diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc 
b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
index 7933a561f07..a972721f5ba 100644
--- a/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
+++ b/docs/user-manual/modules/ROOT/pages/camel-jbang.adoc
@@ -1950,9 +1950,6 @@ The follow options related to _exporting_, can be 
configured in `application.pro
 |`camel.jbang.javaVersion`
 |Java version (11 or 17)
 
-|`camel.jbang.camelVersion`
-|The Camel version
-
 |`camel.jbang.kameletsVersion`
 |Apache Camel Kamelets version
 
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 0e18d1ff481..0238e3c6d2a 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
@@ -600,7 +600,6 @@ public class Run extends CamelCommand {
 openapi = answer.getProperty("camel.jbang.open-api", openapi);
 download = 
"true".equals(answer.getProperty("camel.jbang.download", download ? "true" : 
"false"));
 background = 
"true".equals(answer.getProperty("camel.jbang.background", background ? "true" 
: "false"));
-camelVersion = answer.getProperty("camel.jbang.camel-version", 
camelVersion);
 }
 return answer;
 }