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
commit ea6b6619be2cd2fed2a7ad819f2d5cfc50232416 Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Mar 22 18:45:02 2024 +0100 CAMEL-20604: camel-jbang - Remove -p for run command --- docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc | 2 ++ .../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 5 ++--- .../main/java/org/apache/camel/dsl/jbang/core/commands/Script.java | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc index e14e89a4946..2784ad1d7aa 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-4x-upgrade-guide-4_5.adoc @@ -176,6 +176,8 @@ You can run with `--profile=prod` to turn off all of this, which makes Camel run The command `camel generate rest` have removed all the shorthand arguments `such as `-i -o` instead use the long names `--input --output`. +The shorthand `-p` option from `run` and `script` command has been removed. Use `--prop` instead. + === camel-jsonpath The `camel-jsonpath` will now work more similar as `camel-jq` when you specify a `resultType` and have a list of entities. 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 cf9abe7cee4..735adf4b41c 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 @@ -159,8 +159,7 @@ public class Run extends CamelCommand { @Option(names = { "--maven-settings" }, description = "Optional location of Maven settings.xml file to configure servers, repositories, mirrors and proxies." - + - " If set to \"false\", not even the default ~/.m2/settings.xml will be used.") + + " If set to \"false\", not even the default ~/.m2/settings.xml will be used.") String mavenSettings; @Option(names = { "--maven-settings-security" }, @@ -232,7 +231,7 @@ public class Run extends CamelCommand { " (ex. /path/to/file.properties,/path/to/other.properties") String propertiesFiles; - @Option(names = { "-p", "--prop", "--property" }, description = "Additional properties (override existing)", arity = "0") + @Option(names = { "--prop", "--property" }, description = "Additional properties (override existing)", arity = "0") String[] property; @Option(names = { "--stub" }, description = "Stubs all the matching endpoint with the given component name or pattern." diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java index 290caf592dc..3b4d893be8a 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Script.java @@ -54,7 +54,7 @@ public class Script extends CamelCommand { description = "Load properties file for route placeholders (ex. /path/to/file.properties") String propertiesFiles; - @CommandLine.Option(names = { "-p", "--prop", "--property" }, description = "Additional properties (override existing)", + @CommandLine.Option(names = { "--prop", "--property" }, description = "Additional properties (override existing)", arity = "0") String[] property;