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 2023/10/27 17:00:26 UTC
(camel) branch main updated: Fix typo for name of Maven settings.xml file (#11852)
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 1d815c0951a Fix typo for name of Maven settings.xml file (#11852)
1d815c0951a is described below
commit 1d815c0951a532e8ae989b8303744a3a8ace9c3a
Author: Aurélien Pupier <ap...@redhat.com>
AuthorDate: Fri Oct 27 19:00:20 2023 +0200
Fix typo for name of Maven settings.xml file (#11852)
Signed-off-by: Aurélien Pupier <ap...@redhat.com>
---
.../org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++--
.../src/main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
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 ac472cfd264..dbf055cc107 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
@@ -101,12 +101,12 @@ abstract class ExportBaseCommand extends CamelCommand {
String exclude;
@CommandLine.Option(names = { "--maven-settings" },
- description = "Optional location of maven setting.xml file to configure servers, repositories, mirrors and proxies."
+ 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.")
String mavenSettings;
@CommandLine.Option(names = { "--maven-settings-security" },
- description = "Optional location of maven settings-security.xml file to decrypt settings.xml")
+ description = "Optional location of Maven settings-security.xml file to decrypt settings.xml")
String mavenSettingsSecurity;
@CommandLine.Option(names = { "--main-classname" },
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 d432e2daec1..b52bbce6e6a 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
@@ -151,13 +151,13 @@ public class Run extends CamelCommand {
String gav;
@Option(names = { "--maven-settings" },
- description = "Optional location of maven setting.xml file to configure servers, repositories, mirrors and proxies."
+ 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.")
String mavenSettings;
@Option(names = { "--maven-settings-security" },
- description = "Optional location of maven settings-security.xml file to decrypt settings.xml")
+ description = "Optional location of Maven settings-security.xml file to decrypt settings.xml")
String mavenSettingsSecurity;
@Option(names = { "--fresh" }, description = "Make sure we use fresh (i.e. non-cached) resources")