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 d433a6c4820 Propagate repo from transform message + rename displaygav
due to clash with export gav (#17791)
d433a6c4820 is described below
commit d433a6c4820cac5b9015fe4545bf3432b7c955ce
Author: Federico Mariani <34543311+cro...@users.noreply.github.com>
AuthorDate: Thu Apr 17 19:06:42 2025 +0200
Propagate repo from transform message + rename displaygav due to clash with
export gav (#17791)
---
.../main/java/org/apache/camel/dsl/jbang/core/commands/Run.java | 3 ++-
.../dsl/jbang/core/commands/action/TransformMessageAction.java | 6 +++++-
.../dsl/jbang/core/commands/catalog/CatalogBaseCommand.java | 9 +++++----
3 files changed, 12 insertions(+), 6 deletions(-)
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 724ac94dd37..d398c7d31c6 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
@@ -379,11 +379,12 @@ public class Run extends CamelCommand {
return run();
}
- public Integer runTransformMessage(String camelVersion) throws Exception {
+ public Integer runTransformMessage(String camelVersion, String
repositories) throws Exception {
// just boot silently an empty camel in the background and exit
this.transformMessageRun = true;
this.background = true;
this.camelVersion = camelVersion;
+ this.repositories = repositories;
this.empty = true;
this.ignoreLoadingError = true;
this.name = "transform";
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/TransformMessageAction.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/TransformMessageAction.java
index 42b53462c7c..39e59b11030 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/TransformMessageAction.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/action/TransformMessageAction.java
@@ -116,6 +116,10 @@ public class TransformMessageAction extends
ActionWatchCommand {
description = "Pretty print message body when using
JSon or XML format")
boolean pretty;
+ @CommandLine.Option(names = { "--repos" },
+ description = "Additional maven repositories (Use
commas to separate multiple repositories)")
+ String repositories;
+
private volatile long pid;
private MessageTableHelper tableHelper;
@@ -165,7 +169,7 @@ public class TransformMessageAction extends
ActionWatchCommand {
printer().printErr("This requires Camel version 4.3 or newer");
return -1;
}
- exit = run.runTransformMessage(camelVersion);
+ exit = run.runTransformMessage(camelVersion, repositories);
this.pid = run.spawnPid;
if (exit == 0) {
exit = super.doCall();
diff --git
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
index 6e28cec1cb7..7b7a7d18983 100644
---
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
+++
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/CatalogBaseCommand.java
@@ -68,9 +68,9 @@ public abstract class CatalogBaseCommand extends CamelCommand
{
description = "Sort by name, support-level, or
description", defaultValue = "name")
String sort;
- @CommandLine.Option(names = { "--gav" },
+ @CommandLine.Option(names = { "--display-gav" },
description = "Display Maven GAV instead of name",
defaultValue = "false")
- boolean gav;
+ boolean displayGav;
@CommandLine.Option(names = { "--filter" },
description = "Filter by name or description")
@@ -151,9 +151,10 @@ public abstract class CatalogBaseCommand extends
CamelCommand {
"native",
row.nativeSupported)).collect(Collectors.toList())));
} else {
printer().println(AsciiTable.getTable(AsciiTable.NO_BORDERS,
rows, Arrays.asList(
- new
Column().header("NAME").visible(!gav).dataAlign(HorizontalAlign.LEFT).maxWidth(nameWidth())
+ new
Column().header("NAME").visible(!displayGav).dataAlign(HorizontalAlign.LEFT).maxWidth(nameWidth())
.with(r -> r.name),
- new
Column().header("ARTIFACT-ID").visible(gav).dataAlign(HorizontalAlign.LEFT).with(this::shortGav),
+ new
Column().header("ARTIFACT-ID").visible(displayGav).dataAlign(HorizontalAlign.LEFT)
+ .with(this::shortGav),
new
Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).with(r -> r.level),
new
Column().header("NATIVE").dataAlign(HorizontalAlign.CENTER)
.visible(RuntimeType.quarkus ==
runtime).with(this::nativeSupported),
