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 dce1c33fa61 camel-jbang - Upgrade asciitable that have visible option now. dce1c33fa61 is described below commit dce1c33fa61a65d194e2336ea70f1172bd16e68e Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Mon Sep 19 09:24:44 2022 +0200 camel-jbang - Upgrade asciitable that have visible option now. --- camel-dependencies/pom.xml | 2 +- .../jbang/core/commands/catalog/CatalogBaseCommand.java | 17 +++++------------ parent/pom.xml | 2 +- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml index 6331037895f..5ab7dd3515e 100644 --- a/camel-dependencies/pom.xml +++ b/camel-dependencies/pom.xml @@ -51,7 +51,7 @@ <arquillian-jetty-embedded-9-version>1.0.0.CR3</arquillian-jetty-embedded-9-version> <arquillian-version>1.6.0.Final</arquillian-version> <arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version> - <ascii-table-version>1.6.0</ascii-table-version> + <ascii-table-version>1.7.0</ascii-table-version> <asm-version>8.0.1</asm-version> <asn1bean-version>1.13.0</asn1bean-version> <assertj-version>3.23.1</assertj-version> 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 9ca62028e39..d0f02f4febe 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 @@ -74,18 +74,11 @@ public abstract class CatalogBaseCommand extends CamelCommand { rows.sort(this::sortRow); if (!rows.isEmpty()) { - if (gav) { - System.out.println(AsciiTable.getTable(AsciiTable.NO_BORDERS, rows, Arrays.asList( - new Column().header("NAME").dataAlign(HorizontalAlign.LEFT).with(r -> r.name), - new Column().header("ARTIFACT-ID").dataAlign(HorizontalAlign.LEFT).with(this::shortGav), - new Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).with(r -> r.level), - new Column().header("DESCRIPTION").dataAlign(HorizontalAlign.LEFT).with(this::shortDescription)))); - } else { - System.out.println(AsciiTable.getTable(AsciiTable.NO_BORDERS, rows, Arrays.asList( - new Column().header("NAME").dataAlign(HorizontalAlign.LEFT).with(r -> r.name), - new Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).with(r -> r.level), - new Column().header("DESCRIPTION").dataAlign(HorizontalAlign.LEFT).with(this::shortDescription)))); - } + System.out.println(AsciiTable.getTable(AsciiTable.NO_BORDERS, rows, Arrays.asList( + new Column().header("NAME").dataAlign(HorizontalAlign.LEFT).with(r -> r.name), + new Column().header("ARTIFACT-ID").visible(gav).dataAlign(HorizontalAlign.LEFT).with(this::shortGav), + new Column().header("LEVEL").dataAlign(HorizontalAlign.LEFT).with(r -> r.level), + new Column().header("DESCRIPTION").dataAlign(HorizontalAlign.LEFT).with(this::shortDescription)))); } return 0; diff --git a/parent/pom.xml b/parent/pom.xml index b5111eebfef..bb3d33c0afd 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -68,7 +68,7 @@ <arquillian-jetty-embedded-9-version>1.0.0.CR3</arquillian-jetty-embedded-9-version> <arquillian-version>1.6.0.Final</arquillian-version> <arquillian-weld-embedded-version>2.0.0.Final</arquillian-weld-embedded-version> - <ascii-table-version>1.6.0</ascii-table-version> + <ascii-table-version>1.7.0</ascii-table-version> <asm-version>8.0.1</asm-version> <asn1bean-version>1.13.0</asn1bean-version> <assertj-version>3.23.1</assertj-version>