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/04 19:11:50 UTC

[camel] branch main updated: Polished

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 fff2a09c1c8 Polished
fff2a09c1c8 is described below

commit fff2a09c1c84d8b6851f48e97d81c419a8b279e2
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Oct 4 21:11:35 2023 +0200

    Polished
---
 .../org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java     | 4 ++--
 .../java/org/apache/camel/dsl/jbang/core/commands/Transform.java     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
index 7f0f22e1007..4f052d10534 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/CamelJBangMain.java
@@ -129,6 +129,7 @@ public class CamelJBangMain implements Callable<Integer> {
                         .addSubcommand("copy", new CommandLine(new DependencyCopy(main))))
                 .addSubcommand("generate", new CommandLine(new CodeGenerator(main))
                         .addSubcommand("rest", new CommandLine(new CodeRestGenerator(main))))
+                .addSubcommand("sbom", new CommandLine(new SBOMGenerator(main)))
                 .addSubcommand("catalog", new CommandLine(new CatalogCommand(main))
                         .addSubcommand("component", new CommandLine(new CatalogComponent(main)))
                         .addSubcommand("dataformat", new CommandLine(new CatalogDataFormat(main)))
@@ -150,8 +151,7 @@ public class CamelJBangMain implements Callable<Integer> {
                 .addSubcommand("version", new CommandLine(new VersionCommand(main))
                         .addSubcommand("get", new CommandLine(new VersionGet(main)))
                         .addSubcommand("set", new CommandLine(new VersionSet(main)))
-                        .addSubcommand("list", new CommandLine(new VersionList(main))))
-                .addSubcommand("sbom", new CommandLine(new SBOMGenerator(main)));
+                        .addSubcommand("list", new CommandLine(new VersionList(main))));
 
         commandLine.getCommandSpec().versionProvider(() -> {
             CamelCatalog catalog = new DefaultCamelCatalog();
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java
index 4439455a27b..d1e1bf60c95 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Transform.java
@@ -29,7 +29,7 @@ import org.apache.camel.util.StopWatch;
 import picocli.CommandLine;
 import picocli.CommandLine.Command;
 
-@Command(name = "transform", description = "Transform Camel route to XML or YAML format", sortOptions = false)
+@Command(name = "transform", description = "Transform Camel routes to XML or YAML format", sortOptions = false)
 public class Transform extends CamelCommand {
 
     @CommandLine.Parameters(description = "The Camel file(s) to run. If no files specified then application.properties is used as source for which files to run.",
@@ -52,7 +52,8 @@ public class Transform extends CamelCommand {
     boolean resolvePlaceholders;
 
     @CommandLine.Option(names = { "--uri-as-parameters" },
-                        description = "Whether to expand URIs into separated key/value parameters (only in use for YAML format)")
+                        description = "Whether to expand URIs into separated key/value parameters (only in use for YAML format"
+                                      + "and recommended to enable when using Apache Camel Karavan)")
     boolean uriAsParameters;
 
     @CommandLine.Option(names = { "--ignore-loading-error" },