This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1dc113358f19fe1232e7c0571d34f23a9c2d01b4
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sun Feb 12 16:18:20 2023 +0100
CAMEL-19042: amel-quarkus-catalog - Uses 0.0.1 version
---
.../jbang/core/commands/catalog/CatalogBaseCommand.java | 8 ++++++++
.../jbang/core/commands/catalog/CatalogComponent.java | 2 +-
.../jbang/core/commands/catalog/CatalogDataFormat.java | 2 +-
.../dsl/jbang/core/commands/catalog/CatalogDoc.java | 16 ++++++++++++----
.../dsl/jbang/core/commands/catalog/CatalogLanguage.java | 2 +-
5 files changed, 23 insertions(+), 7 deletions(-)
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 944fe71a5ad..0b1d2900e65 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
@@ -173,6 +173,14 @@ public abstract class CatalogBaseCommand extends
CamelCommand {
}
}
+ static String fixQuarkusSince(String since) {
+ // quarkus-catalog may have 0.1 and 0.0.1 versions that are really 1.0
+ if (since != null && since.startsWith("0")) {
+ return "1.0";
+ }
+ return since;
+ }
+
static class Row {
String name;
String title;
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 a2c30ada5be..4da2893c545 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
@@ -40,7 +40,7 @@ public class CatalogComponent extends CatalogBaseCommand {
row.name = model.getScheme();
row.title = model.getTitle();
row.level = model.getSupportLevel().name();
- row.since = model.getFirstVersionShort();
+ row.since = fixQuarkusSince(model.getFirstVersionShort());
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
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 9f254c386be..569595cf337 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
@@ -40,7 +40,7 @@ public class CatalogDataFormat extends CatalogBaseCommand {
row.name = model.getName();
row.title = model.getTitle();
row.level = model.getSupportLevel().name();
- row.since = model.getFirstVersionShort();
+ row.since = fixQuarkusSince(model.getFirstVersionShort());
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
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 57fefd6421a..d10715a6162 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
@@ -359,7 +359,7 @@ public class CatalogDoc extends CamelCommand {
} else {
System.out.printf("Component Name: %s%n", cm.getName());
}
- System.out.printf("Since: %s%n", cm.getFirstVersionShort());
+ System.out.printf("Since: %s%n",
fixQuarkusSince(cm.getFirstVersionShort()));
System.out.println("");
if (cm.isProducerOnly()) {
System.out.println("Only producer is supported");
@@ -456,7 +456,7 @@ public class CatalogDoc extends CamelCommand {
} else {
System.out.printf("Dataformat Name: %s%n", dm.getName());
}
- System.out.printf("Since: %s%n", dm.getFirstVersionShort());
+ System.out.printf("Since: %s%n",
fixQuarkusSince(dm.getFirstVersionShort()));
System.out.println("");
System.out.printf("%s%n", dm.getDescription());
System.out.println("");
@@ -513,7 +513,7 @@ public class CatalogDoc extends CamelCommand {
} else {
System.out.printf("Language Name: %s%n", lm.getName());
}
- System.out.printf("Since: %s%n", lm.getFirstVersionShort());
+ System.out.printf("Since: %s%n",
fixQuarkusSince(lm.getFirstVersionShort()));
System.out.println("");
System.out.printf("%s%n", lm.getDescription());
System.out.println("");
@@ -570,7 +570,7 @@ public class CatalogDoc extends CamelCommand {
} else {
System.out.printf("Miscellaneous Name: %s%n", om.getName());
}
- System.out.printf("Since: %s%n", om.getFirstVersionShort());
+ System.out.printf("Since: %s%n",
fixQuarkusSince(om.getFirstVersionShort()));
System.out.println("");
System.out.printf("%s%n", om.getDescription());
System.out.println("");
@@ -680,4 +680,12 @@ public class CatalogDoc extends CamelCommand {
.collect(Collectors.toList());
}
+ static String fixQuarkusSince(String since) {
+ // quarkus-catalog may have 0.1 and 0.0.1 versions that are really 1.0
+ if (since != null && since.startsWith("0")) {
+ return "1.0";
+ }
+ return since;
+ }
+
}
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 d6a22346349..b2128805c20 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
@@ -40,7 +40,7 @@ public class CatalogLanguage extends CatalogBaseCommand {
row.name = model.getName();
row.title = model.getTitle();
row.level = model.getSupportLevel().name();
- row.since = model.getFirstVersionShort();
+ row.since = fixQuarkusSince(model.getFirstVersionShort());
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
