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/08/11 09:49:17 UTC
[camel] branch camel-4.0.x updated: camel-jbang - Do not sort option in --help output
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-4.0.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-4.0.x by this push:
new 37dd7adf570 camel-jbang - Do not sort option in --help output
37dd7adf570 is described below
commit 37dd7adf570d3df071299db26fe326fb2ef5d6c8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Aug 11 11:48:47 2023 +0200
camel-jbang - Do not sort option in --help output
---
.../apache/camel/dsl/jbang/core/commands/Bind.java | 14 +++++++-------
.../apache/camel/dsl/jbang/core/commands/Init.java | 20 ++++++++++----------
.../apache/camel/dsl/jbang/core/commands/Pipe.java | 4 ++--
.../dsl/jbang/core/commands/action/CamelAction.java | 3 ++-
.../jbang/core/commands/action/CamelGCAction.java | 2 +-
.../jbang/core/commands/action/CamelLogAction.java | 2 +-
.../core/commands/action/CamelReloadAction.java | 2 +-
.../core/commands/action/CamelResetStatsAction.java | 2 +-
.../core/commands/action/CamelRouteDumpAction.java | 2 +-
.../core/commands/action/CamelRouteStartAction.java | 2 +-
.../core/commands/action/CamelRouteStopAction.java | 2 +-
.../jbang/core/commands/action/CamelSendAction.java | 2 +-
.../core/commands/action/CamelSourceAction.java | 2 +-
.../jbang/core/commands/action/CamelSourceTop.java | 2 +-
.../jbang/core/commands/action/CamelThreadDump.java | 2 +-
.../jbang/core/commands/action/CamelTraceAction.java | 2 +-
.../dsl/jbang/core/commands/action/LoggerAction.java | 2 +-
.../core/commands/action/RouteControllerAction.java | 3 ++-
.../core/commands/catalog/CatalogComponent.java | 2 +-
.../core/commands/catalog/CatalogDataFormat.java | 2 +-
.../dsl/jbang/core/commands/catalog/CatalogDoc.java | 2 +-
.../jbang/core/commands/catalog/CatalogKamelet.java | 2 +-
.../jbang/core/commands/catalog/CatalogLanguage.java | 2 +-
.../jbang/core/commands/catalog/CatalogOther.java | 2 +-
.../dsl/jbang/core/commands/config/ConfigGet.java | 2 +-
.../dsl/jbang/core/commands/config/ConfigList.java | 2 +-
.../dsl/jbang/core/commands/config/ConfigSet.java | 2 +-
.../dsl/jbang/core/commands/config/ConfigUnset.java | 2 +-
.../core/commands/process/CamelContextStatus.java | 3 ++-
.../jbang/core/commands/process/CamelContextTop.java | 3 ++-
.../dsl/jbang/core/commands/process/CamelCount.java | 3 ++-
.../core/commands/process/CamelProcessorStatus.java | 3 ++-
.../core/commands/process/CamelProcessorTop.java | 3 ++-
.../core/commands/process/CamelRouteStatus.java | 3 ++-
.../jbang/core/commands/process/CamelRouteTop.java | 3 ++-
.../dsl/jbang/core/commands/process/CamelStatus.java | 3 ++-
.../dsl/jbang/core/commands/process/CamelTop.java | 3 ++-
.../dsl/jbang/core/commands/process/Hawtio.java | 2 +-
.../dsl/jbang/core/commands/process/Jolokia.java | 2 +-
.../dsl/jbang/core/commands/process/ListBlocked.java | 2 +-
.../core/commands/process/ListCircuitBreaker.java | 2 +-
.../jbang/core/commands/process/ListEndpoint.java | 2 +-
.../dsl/jbang/core/commands/process/ListEvent.java | 2 +-
.../dsl/jbang/core/commands/process/ListHealth.java | 2 +-
.../jbang/core/commands/process/ListInflight.java | 2 +-
.../dsl/jbang/core/commands/process/ListMetric.java | 2 +-
.../dsl/jbang/core/commands/process/ListProcess.java | 2 +-
.../dsl/jbang/core/commands/process/ListService.java | 2 +-
.../dsl/jbang/core/commands/process/ListVault.java | 2 +-
.../dsl/jbang/core/commands/process/StopProcess.java | 2 +-
.../dsl/jbang/core/commands/version/VersionList.java | 15 ++++++++++-----
51 files changed, 87 insertions(+), 71 deletions(-)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
index d47da404793..5c44caac10c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Bind.java
@@ -44,9 +44,15 @@ import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asStringS
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.asText;
import static org.apache.camel.dsl.yaml.common.YamlDeserializerSupport.nodeAt;
-@Command(name = "bind", description = "Bind source and sink Kamelets as a new Camel integration")
+@Command(name = "bind", description = "Bind source and sink Kamelets as a new Camel integration",
+ sortOptions = false)
public class Bind extends CamelCommand {
+ @CommandLine.Parameters(description = "Name of binding file to be saved", arity = "1",
+ paramLabel = "<file>", parameterConsumer = FileConsumer.class)
+ Path filePath; // Defined only for file path completion; the field never used
+ String file;
+
@CommandLine.Option(names = { "--source" }, description = "Source (from) such as a Kamelet or Camel endpoint uri",
required = true)
String source;
@@ -58,12 +64,6 @@ public class Bind extends CamelCommand {
required = true)
String sink;
- @CommandLine.Parameters(description = "Name of binding file to be saved", arity = "1",
- paramLabel = "<file>", parameterConsumer = FileConsumer.class)
- Path filePath; // Defined only for file path completion; the field never used
-
- String file;
-
public Bind(CamelJBangMain main) {
super(main);
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
index 92c33c4bc6d..75f46f30290 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Init.java
@@ -41,31 +41,31 @@ import static org.apache.camel.dsl.jbang.core.common.GistHelper.fetchGistUrls;
import static org.apache.camel.dsl.jbang.core.common.GitHubHelper.asGithubSingleUrl;
import static org.apache.camel.dsl.jbang.core.common.GitHubHelper.fetchGithubUrls;
-@Command(name = "init", description = "Creates a new Camel integration")
+@Command(name = "init", description = "Creates a new Camel integration",
+ sortOptions = false)
public class Init extends CamelCommand {
@Parameters(description = "Name of integration file (or a github link)", arity = "1",
paramLabel = "<file>", parameterConsumer = FileConsumer.class)
private Path filePath; // Defined only for file path completion; the field never used
-
private String file;
- @Option(names = { "--integration" },
- description = "When creating a yaml file should it be created as a Camel K Integration CRD")
- private boolean integration;
+ @Option(names = {
+ "--dir",
+ "--directory" }, description = "Directory where the project will be saved", defaultValue = ".")
+ private String directory;
@Option(names = { "--from-kamelet" },
- description = "To be used for extending an existing Kamelet")
+ description = "To be used when extending an existing Kamelet")
private String fromKamelet;
@Option(names = {
"--kamelets-version" }, description = "Apache Camel Kamelets version", defaultValue = "4.0.0-RC1")
private String kameletsVersion;
- @Option(names = {
- "--dir",
- "--directory" }, description = "Directory where the project will be saved", defaultValue = ".")
- private String directory;
+ @Option(names = { "--integration" },
+ description = "When creating a yaml file should it be created as a Camel K Integration CRD")
+ private boolean integration;
public Init(CamelJBangMain main) {
super(main);
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
index 636f6cb474e..0d9261a93e1 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/Pipe.java
@@ -22,13 +22,13 @@ import java.util.Stack;
import org.apache.camel.dsl.jbang.core.common.LoggingLevelCompletionCandidates;
import picocli.CommandLine;
-@CommandLine.Command(name = "pipe", description = "Run Camel integration in pipe and filters mode for terminal scripting")
+@CommandLine.Command(name = "pipe", description = "Run Camel integration in pipe and filters mode for terminal scripting",
+ sortOptions = false)
public class Pipe extends CamelCommand {
@CommandLine.Parameters(description = "Name of file", arity = "1",
paramLabel = "<file>", parameterConsumer = FileConsumer.class)
Path filePath; // Defined only for file path completion; the field never used
-
String file;
@CommandLine.Option(names = { "--max-messages" }, defaultValue = "0",
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelAction.java
index 377042e9efb..540b3522436 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelAction.java
@@ -20,7 +20,8 @@ import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import picocli.CommandLine;
@CommandLine.Command(name = "cmd",
- description = "Performs commands in the running Camel integrations, such as start/stop route, or change logging levels. (use cmd --help to see sub commands)")
+ description = "Performs commands in the running Camel integrations, such as start/stop route, or change logging levels. (use cmd --help to see sub commands)",
+ sortOptions = false)
public class CamelAction extends ActionBaseCommand {
public CamelAction(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java
index 2d706c1db94..c0840dac0d2 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelGCAction.java
@@ -25,7 +25,7 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
@CommandLine.Command(name = "gc",
- description = "Trigger Java Memory Garbage Collector")
+ description = "Trigger Java Memory Garbage Collector", sortOptions = false)
public class CamelGCAction extends ActionBaseCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration. (default selects all)", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
index 28e21302fdf..9c742b38b3c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelLogAction.java
@@ -47,7 +47,7 @@ import org.fusesource.jansi.AnsiConsole;
import picocli.CommandLine;
@CommandLine.Command(name = "log",
- description = "Tail logs from running Camel integrations")
+ description = "Tail logs from running Camel integrations", sortOptions = false)
public class CamelLogAction extends ActionBaseCommand {
private static final int NAME_MAX_WIDTH = 25;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
index b7f347b46c4..12280a49996 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelReloadAction.java
@@ -25,7 +25,7 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
@CommandLine.Command(name = "reload",
- description = "Trigger reloading Camel")
+ description = "Trigger reloading Camel", sortOptions = false)
public class CamelReloadAction extends ActionBaseCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration. (default selects all)", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
index f680e90387b..68f56ce7213 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelResetStatsAction.java
@@ -25,7 +25,7 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
@CommandLine.Command(name = "reset-stats",
- description = "Reset performance statistics")
+ description = "Reset performance statistics", sortOptions = false)
public class CamelResetStatsAction extends ActionBaseCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration. (default selects all)", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDumpAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDumpAction.java
index 097779c3549..4bb094a8405 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDumpAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteDumpAction.java
@@ -36,7 +36,7 @@ import picocli.CommandLine.Command;
import static org.apache.camel.support.LoggerHelper.stripSourceLocationLineNumber;
-@Command(name = "route-dump", description = "Dump Camel route in XML or YAML format")
+@Command(name = "route-dump", description = "Dump Camel route in XML or YAML format", sortOptions = false)
public class CamelRouteDumpAction extends ActionBaseCommand {
public static class NameIdCompletionCandidates implements Iterable<String> {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStartAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStartAction.java
index 50b8076671d..7f295fff68c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStartAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStartAction.java
@@ -21,7 +21,7 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
@CommandLine.Command(name = "start-route",
- description = "Start Camel routes")
+ description = "Start Camel routes", sortOptions = false)
public class CamelRouteStartAction extends CamelRouteAction {
public CamelRouteStartAction(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStopAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStopAction.java
index 6c63d889974..ea0c1972e11 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStopAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelRouteStopAction.java
@@ -21,7 +21,7 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
@CommandLine.Command(name = "stop-route",
- description = "Stop Camel routes")
+ description = "Stop Camel routes", sortOptions = false)
public class CamelRouteStopAction extends CamelRouteAction {
public CamelRouteStopAction(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
index b2168f18d00..d2a2dada103 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSendAction.java
@@ -36,7 +36,7 @@ import org.fusesource.jansi.AnsiConsole;
import picocli.CommandLine;
@CommandLine.Command(name = "send",
- description = "Sends a message to a system via an existing running Camel integration")
+ description = "Sends a message to a system via an existing running Camel integration", sortOptions = false)
public class CamelSendAction extends ActionBaseCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
index 5c99dfcf616..748c56a2160 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceAction.java
@@ -34,7 +34,7 @@ import picocli.CommandLine.Command;
import static org.apache.camel.support.LoggerHelper.stripSourceLocationLineNumber;
-@Command(name = "source", description = "Display Camel route source code")
+@Command(name = "source", description = "Display Camel route source code", sortOptions = false)
public class CamelSourceAction extends ActionBaseCommand {
// TODO: strip license header
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java
index 2bd7585a510..b378979df26 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelSourceTop.java
@@ -32,7 +32,7 @@ import org.apache.camel.util.json.Jsoner;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "source", description = "List top processors (source) in a running Camel integration")
+@Command(name = "source", description = "List top processors (source) in a running Camel integration", sortOptions = false)
public class CamelSourceTop extends ActionWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
index 9292568c31b..257c424c074 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelThreadDump.java
@@ -38,7 +38,7 @@ import org.apache.camel.util.json.Jsoner;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "thread-dump", description = "List threads in a running Camel integration")
+@Command(name = "thread-dump", description = "List threads in a running Camel integration", sortOptions = false)
public class CamelThreadDump extends ActionWatchCommand {
public static class IdNameStateCompletionCandidates implements Iterable<String> {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
index dfb03d4c577..7d31a474df9 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/CamelTraceAction.java
@@ -51,7 +51,7 @@ import org.fusesource.jansi.AnsiConsole;
import picocli.CommandLine;
@CommandLine.Command(name = "trace",
- description = "Tail message traces from running Camel integrations")
+ description = "Tail message traces from running Camel integrations", sortOptions = false)
public class CamelTraceAction extends ActionBaseCommand {
private static final int NAME_MAX_WIDTH = 25;
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
index 5b4c3a23947..e3f0f6d635c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/LoggerAction.java
@@ -36,7 +36,7 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
@CommandLine.Command(name = "logger",
- description = "List or change logging levels")
+ description = "List or change logging levels", sortOptions = false)
public class LoggerAction extends ActionBaseCommand {
@CommandLine.Option(names = { "--sort" }, completionCandidates = PidNameAgeCompletionCandidates.class,
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java
index 10a1e9c02d2..a6280cb63e0 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/RouteControllerAction.java
@@ -39,7 +39,8 @@ import org.apache.camel.util.json.Jsoner;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "route-controller", description = "List status of route controller in a running Camel integration")
+@Command(name = "route-controller", description = "List status of route controller in a running Camel integration",
+ sortOptions = false)
public class RouteControllerAction extends ActionWatchCommand {
public static class IdStateCompletionCandidates implements Iterable<String> {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
index b30619d6694..704a09be018 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogComponent.java
@@ -24,7 +24,7 @@ import org.apache.camel.tooling.model.ComponentModel;
import picocli.CommandLine;
@CommandLine.Command(name = "component",
- description = "List components from the Camel Catalog")
+ description = "List components from the Camel Catalog", sortOptions = false)
public class CatalogComponent extends CatalogBaseCommand {
public CatalogComponent(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
index 0e10ffb31e8..6adfdcdbe88 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDataFormat.java
@@ -24,7 +24,7 @@ import org.apache.camel.tooling.model.DataFormatModel;
import picocli.CommandLine;
@CommandLine.Command(name = "dataformat",
- description = "List data formats from the Camel Catalog")
+ description = "List data formats from the Camel Catalog", sortOptions = false)
public class CatalogDataFormat extends CatalogBaseCommand {
public CatalogDataFormat(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
index abba4786709..cb2156b7adb 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogDoc.java
@@ -48,7 +48,7 @@ import picocli.CommandLine;
import static org.apache.camel.dsl.jbang.core.commands.catalog.CatalogBaseCommand.findComponentNames;
@CommandLine.Command(name = "doc",
- description = "Shows documentation for kamelet, component, and other Camel resources")
+ description = "Shows documentation for kamelet, component, and other Camel resources", sortOptions = false)
public class CatalogDoc extends CamelCommand {
@CommandLine.Parameters(description = "Name of kamelet, component, dataformat, or other Camel resource",
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
index 576a4c9c03f..e9ab75b38e1 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogKamelet.java
@@ -36,7 +36,7 @@ import org.apache.camel.util.StringHelper;
import picocli.CommandLine;
@CommandLine.Command(name = "kamelet",
- description = "List Kamelets from the Kamelet Catalog")
+ description = "List Kamelets from the Kamelet Catalog", sortOptions = false)
public class CatalogKamelet extends CamelCommand {
@CommandLine.Option(names = { "--sort" },
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
index 0ea36d6c42f..1899ea3fbc3 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogLanguage.java
@@ -24,7 +24,7 @@ import org.apache.camel.tooling.model.LanguageModel;
import picocli.CommandLine;
@CommandLine.Command(name = "language",
- description = "List expression languages from the Camel Catalog")
+ description = "List expression languages from the Camel Catalog", sortOptions = false)
public class CatalogLanguage extends CatalogBaseCommand {
public CatalogLanguage(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
index 2d2253543a2..650f0670a95 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java
@@ -24,7 +24,7 @@ import org.apache.camel.tooling.model.OtherModel;
import picocli.CommandLine;
@CommandLine.Command(name = "other",
- description = "List miscellaneous components from the Camel Catalog")
+ description = "List miscellaneous components from the Camel Catalog", sortOptions = false)
public class CatalogOther extends CatalogBaseCommand {
public CatalogOther(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
index 115ffd22590..f2b738251dd 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigGet.java
@@ -22,7 +22,7 @@ import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
import picocli.CommandLine;
@CommandLine.Command(name = "get",
- description = "Display user configuration value")
+ description = "Display user configuration value", sortOptions = false)
public class ConfigGet extends CamelCommand {
@CommandLine.Parameters(description = "Configuration key", arity = "1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java
index 2a94ade37d0..683bff70944 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigList.java
@@ -21,7 +21,7 @@ import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
import picocli.CommandLine;
-@CommandLine.Command(name = "list", description = "Displays user configuration")
+@CommandLine.Command(name = "list", description = "Displays user configuration", sortOptions = false)
public class ConfigList extends CamelCommand {
public ConfigList(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
index fd21a22eff1..e4a61c8d477 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigSet.java
@@ -23,7 +23,7 @@ import org.apache.camel.util.StringHelper;
import picocli.CommandLine;
@CommandLine.Command(name = "set",
- description = "Set user configuration value")
+ description = "Set user configuration value", sortOptions = false)
public class ConfigSet extends CamelCommand {
@CommandLine.Parameters(description = "Configuration parameter (ex. key=value)", arity = "1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
index 6dc867d0df1..b6f854740bd 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/config/ConfigUnset.java
@@ -22,7 +22,7 @@ import org.apache.camel.dsl.jbang.core.common.CommandLineHelper;
import picocli.CommandLine;
@CommandLine.Command(name = "unset",
- description = "Remove user configuration value")
+ description = "Remove user configuration value", sortOptions = false)
public class ConfigUnset extends CamelCommand {
@CommandLine.Parameters(description = "Configuration key", arity = "1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
index f77031baca0..ae7fbe93867 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextStatus.java
@@ -36,7 +36,8 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "context",
- description = "Get status of Camel integrations")
+ description = "Get status of Camel integrations",
+ sortOptions = false)
public class CamelContextStatus extends ProcessWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
index a4455265626..b0cd0864744 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelContextTop.java
@@ -35,7 +35,8 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "context",
- description = "Top status of Camel integrations")
+ description = "Top status of Camel integrations",
+ sortOptions = false)
public class CamelContextTop extends ProcessWatchCommand {
public static class PidNameMemAgeCompletionCandidates implements Iterable<String> {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java
index 94f65b280cf..b1015e5dd53 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelCount.java
@@ -34,7 +34,8 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "count",
- description = "Get total and failed exchanges for running integrations")
+ description = "Get total and failed exchanges for running integrations",
+ sortOptions = false)
public class CamelCount extends ProcessWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
index 4ccdc11ba39..473a9409075 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorStatus.java
@@ -35,7 +35,8 @@ import org.apache.camel.util.json.Jsoner;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "processor", description = "Get status of Camel processors")
+@Command(name = "processor", description = "Get status of Camel processors",
+ sortOptions = false)
public class CamelProcessorStatus extends ProcessWatchCommand {
public static class PidNameCompletionCandidates implements Iterable<String> {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorTop.java
index cd765b98b9a..fa8a9e27cee 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorTop.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelProcessorTop.java
@@ -19,7 +19,8 @@ package org.apache.camel.dsl.jbang.core.commands.process;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import picocli.CommandLine.Command;
-@Command(name = "processor", description = "Top performing processors")
+@Command(name = "processor", description = "Top performing processors",
+ sortOptions = false)
public class CamelProcessorTop extends CamelProcessorStatus {
public CamelProcessorTop(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
index 595fd8f291e..2fcc8f062bb 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteStatus.java
@@ -34,7 +34,8 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "route", description = "Get status of Camel routes")
+@Command(name = "route", description = "Get status of Camel routes",
+ sortOptions = false)
public class CamelRouteStatus extends ProcessWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteTop.java
index 9d79c668d03..383613d2e75 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteTop.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelRouteTop.java
@@ -26,7 +26,8 @@ import com.github.freva.asciitable.OverflowBehaviour;
import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import picocli.CommandLine.Command;
-@Command(name = "route", description = "Top performing routes")
+@Command(name = "route", description = "Top performing routes",
+ sortOptions = false)
public class CamelRouteTop extends CamelRouteStatus {
public CamelRouteTop(CamelJBangMain main) {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java
index d54b6811600..a8005e4d417 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelStatus.java
@@ -21,7 +21,8 @@ import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import picocli.CommandLine;
@CommandLine.Command(name = "get",
- description = "Get status of Camel integrations (use get --help to see sub commands)")
+ description = "Get status of Camel integrations (use get --help to see sub commands)",
+ sortOptions = false)
public class CamelStatus extends CamelCommand {
@CommandLine.Option(names = { "--watch" },
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java
index 7898cb20a8b..321169f17f7 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/CamelTop.java
@@ -21,7 +21,8 @@ import org.apache.camel.dsl.jbang.core.commands.CamelJBangMain;
import picocli.CommandLine;
@CommandLine.Command(name = "top",
- description = "Top status of Camel integrations (use top --help to see sub commands)")
+ description = "Top status of Camel integrations (use top --help to see sub commands)",
+ sortOptions = false)
public class CamelTop extends CamelCommand {
@CommandLine.Option(names = { "--watch" },
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
index 5633ffc61d8..dae1c05a20b 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Hawtio.java
@@ -30,7 +30,7 @@ import org.apache.camel.tooling.maven.MavenArtifact;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "hawtio", description = "Launch Hawtio web console")
+@Command(name = "hawtio", description = "Launch Hawtio web console", sortOptions = false)
public class Hawtio extends CamelCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
index 1c9f580fef7..e28cadccacd 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/Jolokia.java
@@ -26,7 +26,7 @@ import org.jolokia.jvmagent.client.util.VirtualMachineHandlerOperations;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "jolokia", description = "Attach Jolokia JVM Agent to a running Camel integration")
+@Command(name = "jolokia", description = "Attach Jolokia JVM Agent to a running Camel integration", sortOptions = false)
public class Jolokia extends ProcessBaseCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java
index fad70f55e59..13790803871 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListBlocked.java
@@ -34,7 +34,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "blocked",
- description = "Get blocked messages of Camel integrations")
+ description = "Get blocked messages of Camel integrations", sortOptions = false)
public class ListBlocked extends ProcessWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java
index b96f39b82ae..22d47843767 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListCircuitBreaker.java
@@ -34,7 +34,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "circuit-breaker",
- description = "Get status of Circuit Breaker EIPs")
+ description = "Get status of Circuit Breaker EIPs", sortOptions = false)
public class ListCircuitBreaker extends ProcessWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java
index 792d1a8ec93..eb174fb731f 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEndpoint.java
@@ -34,7 +34,7 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "endpoint", description = "Get usage of Camel endpoints")
+@Command(name = "endpoint", description = "Get usage of Camel endpoints", sortOptions = false)
public class ListEndpoint extends ProcessWatchCommand {
public static class PidNameAgeTotalCompletionCandidates implements Iterable<String> {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
index 12373e958f4..ad328ee70a6 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListEvent.java
@@ -34,7 +34,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "event",
- description = "Get latest events of Camel integrations")
+ description = "Get latest events of Camel integrations", sortOptions = false)
public class ListEvent extends ProcessWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
index 8af0c91103d..911faad8948 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListHealth.java
@@ -40,7 +40,7 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "health", description = "Get health check status of running Camel integrations")
+@Command(name = "health", description = "Get health check status of running Camel integrations", sortOptions = false)
public class ListHealth extends ProcessWatchCommand {
@CommandLine.Option(names = { "--sort" }, completionCandidates = PidNameAgeCompletionCandidates.class,
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java
index d67bc561908..89ab5832c0d 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListInflight.java
@@ -34,7 +34,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "inflight",
- description = "Get inflight messages of Camel integrations")
+ description = "Get inflight messages of Camel integrations", sortOptions = false)
public class ListInflight extends ProcessWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java
index c21de371038..6427b955a08 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListMetric.java
@@ -34,7 +34,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "metric",
- description = "Get metrics (micrometer) of running Camel integrations")
+ description = "Get metrics (micrometer) of running Camel integrations", sortOptions = false)
public class ListMetric extends ProcessWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
index 04749185668..6728cf9fc3c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListProcess.java
@@ -32,7 +32,7 @@ import org.apache.camel.util.json.JsonObject;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "ps", description = "List running Camel integrations")
+@Command(name = "ps", description = "List running Camel integrations", sortOptions = false)
public class ListProcess extends ProcessWatchCommand {
@CommandLine.Option(names = { "--sort" }, completionCandidates = PidNameAgeCompletionCandidates.class,
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
index d3861d6501b..65399519a82 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListService.java
@@ -34,7 +34,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "service",
- description = "Get services of Camel integrations")
+ description = "Get services of Camel integrations", sortOptions = false)
public class ListService extends ProcessWatchCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
index 0c3d149e5d7..932fa715f3c 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/ListVault.java
@@ -34,7 +34,7 @@ import picocli.CommandLine;
import picocli.CommandLine.Command;
@Command(name = "vault",
- description = "List secrets from security vaults used by running Camel integrations")
+ description = "List secrets from security vaults used by running Camel integrations", sortOptions = false)
public class ListVault extends ProcessWatchCommand {
public static class PidNameCompletionCandidates implements Iterable<String> {
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
index 741396875a3..19e6afe0986 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/process/StopProcess.java
@@ -24,7 +24,7 @@ import org.apache.camel.util.FileUtil;
import picocli.CommandLine;
import picocli.CommandLine.Command;
-@Command(name = "stop", description = "Shuts down running Camel integrations")
+@Command(name = "stop", description = "Shuts down running Camel integrations", sortOptions = false)
public class StopProcess extends ProcessBaseCommand {
@CommandLine.Parameters(description = "Name or pid of running Camel integration(s)", arity = "0..1")
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
index 157bc2517ed..37ee89ca9b0 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/version/VersionList.java
@@ -47,7 +47,8 @@ import org.apache.camel.tooling.model.ReleaseModel;
import org.apache.camel.util.StringHelper;
import picocli.CommandLine;
-@CommandLine.Command(name = "list", description = "Displays available Camel versions")
+@CommandLine.Command(name = "list", description = "Displays available Camel versions",
+ sortOptions = false)
public class VersionList extends CamelCommand {
private static final String YYYY_MM_DD = "yyyy-MM-dd";
@@ -57,10 +58,6 @@ public class VersionList extends CamelCommand {
private static final String GIT_CAMEL_QUARKUS_URL
= "https://raw.githubusercontent.com/apache/camel-website/main/content/releases/q/release-%s.md";
- @CommandLine.Option(names = { "--sort" },
- description = "Sort by version", defaultValue = "version")
- String sort;
-
@CommandLine.Option(names = { "--runtime" }, completionCandidates = RuntimeCompletionCandidates.class,
description = "Runtime (spring-boot, quarkus, or camel-main)")
String runtime;
@@ -82,6 +79,10 @@ public class VersionList extends CamelCommand {
@CommandLine.Option(names = { "--fresh" }, description = "Make sure we use fresh (i.e. non-cached) resources")
boolean fresh;
+ @CommandLine.Option(names = { "--sort" },
+ description = "Sort by (version, or date)", defaultValue = "version")
+ String sort;
+
public VersionList(CamelJBangMain main) {
super(main);
}
@@ -201,6 +202,10 @@ public class VersionList extends CamelCommand {
switch (s) {
case "version":
return VersionHelper.compare(o1.coreVersion, o2.coreVersion) * negate;
+ case "date":
+ String d1 = o1.releaseDate != null ? o1.releaseDate : "";
+ String d2 = o2.releaseDate != null ? o2.releaseDate : "";
+ return d1.compareTo(d2) * negate;
default:
return 0;
}