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 2024/03/22 17:47:46 UTC
(camel) branch main updated (b62749b8dad -> 03548144f92)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from b62749b8dad Regen
new ea6b6619be2 CAMEL-20604: camel-jbang - Remove -p for run command
new 03548144f92 Thanks Freeman we can upgrade to cxf plugin 4.0.4
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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 +-
parent/pom.xml | 2 +-
4 files changed, 6 insertions(+), 5 deletions(-)
(camel) 02/02: Thanks Freeman we can upgrade to cxf plugin 4.0.4
Posted by da...@apache.org.
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 03548144f9222297a3d0314a9fde3db9607fced9
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Mar 22 18:47:24 2024 +0100
Thanks Freeman we can upgrade to cxf plugin 4.0.4
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 8e3a1a5c29f..a9539ccbd9d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -117,7 +117,7 @@
<couchbase-client-version>3.5.3</couchbase-client-version>
<curator-version>5.6.0</curator-version>
<cxf-version>4.0.4</cxf-version>
- <cxf-codegen-plugin-version>4.0.3</cxf-codegen-plugin-version>
+ <cxf-codegen-plugin-version>4.0.4</cxf-codegen-plugin-version>
<!-- cxf-xjc is not released as often -->
<cxf-xjc-plugin-version>4.0.1</cxf-xjc-plugin-version>
<cxf-xjc-utils-version>4.0.1</cxf-xjc-utils-version>
(camel) 01/02: CAMEL-20604: camel-jbang - Remove -p for run command
Posted by da...@apache.org.
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 <cl...@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;