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/02/12 15:19:35 UTC
[camel] branch camel-3.x updated (652d16535c1 -> 1dc113358f1)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch camel-3.x
in repository https://gitbox.apache.org/repos/asf/camel.git
from 652d16535c1 CAMEL-19030: camel-jbang - doc and catalog to support --camel-version option
new 0bfa9238cc1 CAMEL-19030: camel-jbang - doc and catalog to support --runtime and fix loading quarkus catalog
new 1dc113358f1 CAMEL-19042: amel-quarkus-catalog - Uses 0.0.1 version
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/commands/catalog/CatalogBaseCommand.java | 25 +++++++++++++++++--
.../core/commands/catalog/CatalogComponent.java | 2 +-
.../core/commands/catalog/CatalogDataFormat.java | 2 +-
.../jbang/core/commands/catalog/CatalogDoc.java | 29 +++++++++++++++++-----
.../core/commands/catalog/CatalogLanguage.java | 2 +-
.../camel/dsl/jbang/core/common/CatalogLoader.java | 8 ++++++
6 files changed, 57 insertions(+), 11 deletions(-)
[camel] 01/02: CAMEL-19030: camel-jbang - doc and catalog to support --runtime and fix loading quarkus catalog
Posted by da...@apache.org.
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 0bfa9238cc1a7fde4aa6a2204304e9485d6869af
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Feb 12 16:09:50 2023 +0100
CAMEL-19030: camel-jbang - doc and catalog to support --runtime and fix loading quarkus catalog
---
.../jbang/core/commands/catalog/CatalogBaseCommand.java | 17 +++++++++++++++--
.../dsl/jbang/core/commands/catalog/CatalogDoc.java | 13 +++++++++++--
.../camel/dsl/jbang/core/common/CatalogLoader.java | 8 ++++++++
3 files changed, 34 insertions(+), 4 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 727d2c0cb57..944fe71a5ad 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
@@ -41,6 +41,13 @@ public abstract class CatalogBaseCommand extends CamelCommand {
description = "To run using a different Camel version than the default version.")
String camelVersion;
+ @CommandLine.Option(names = { "--runtime" }, description = "Runtime (spring-boot, quarkus, or camel-main)")
+ String runtime;
+
+ @CommandLine.Option(names = { "--quarkus-version" }, description = "Quarkus Platform version",
+ defaultValue = "2.16.0.Final")
+ String quarkusVersion;
+
@CommandLine.Option(names = { "--repos" },
description = "Additional maven repositories for download on-demand (Use commas to separate multiple repositories)")
String repos;
@@ -78,11 +85,17 @@ public abstract class CatalogBaseCommand extends CamelCommand {
}
CamelCatalog loadCatalog() throws Exception {
+ // silent logging when download catalogs
+ RuntimeUtil.configureLog("off", false, false, false, false);
+
+ if ("spring-boot".equals(runtime)) {
+ return CatalogLoader.loadSpringBootCatalog(repos, camelVersion);
+ } else if ("quarkus".equals(runtime)) {
+ return CatalogLoader.loadQuarkusCatalog(repos, quarkusVersion);
+ }
if (camelVersion == null) {
return new DefaultCamelCatalog(true);
} else {
- // silent logging when download catalogs
- RuntimeUtil.configureLog("off", false, false, false, false);
return CatalogLoader.loadCatalog(repos, camelVersion);
}
}
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 0fdf309abc9..57fefd6421a 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
@@ -57,6 +57,9 @@ public class CatalogDoc extends CamelCommand {
description = "To run using a different Camel version than the default version.")
String camelVersion;
+ @CommandLine.Option(names = { "--runtime" }, description = "Runtime (spring-boot, quarkus, or camel-main)")
+ String runtime;
+
@CommandLine.Option(names = { "--repos" },
description = "Additional maven repositories for download on-demand (Use commas to separate multiple repositories)")
String repos;
@@ -90,11 +93,17 @@ public class CatalogDoc extends CamelCommand {
}
CamelCatalog loadCatalog() throws Exception {
+ // silent logging when download catalogs
+ RuntimeUtil.configureLog("off", false, false, false, false);
+
+ if ("spring-boot".equals(runtime)) {
+ return CatalogLoader.loadSpringBootCatalog(repos, camelVersion);
+ } else if ("quarkus".equals(runtime)) {
+ return CatalogLoader.loadQuarkusCatalog(repos, camelVersion);
+ }
if (camelVersion == null) {
return new DefaultCamelCatalog(true);
} else {
- // silent logging when download catalogs
- RuntimeUtil.configureLog("off", false, false, false, false);
return CatalogLoader.loadCatalog(repos, camelVersion);
}
}
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CatalogLoader.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CatalogLoader.java
index 2403073df81..e29672496d5 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CatalogLoader.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CatalogLoader.java
@@ -141,6 +141,14 @@ public final class CatalogLoader {
String camelQuarkusVersion = null;
CamelCatalog answer = new DefaultCamelCatalog(true);
+ // quarkus version must end with .Final
+ if (quarkusVersion == null) {
+ return answer;
+ }
+ if (!quarkusVersion.endsWith(".Final")) {
+ quarkusVersion += ".Final";
+ }
+
// use kamelet-main to dynamic download dependency via maven
KameletMain main = new KameletMain();
try {
[camel] 02/02: CAMEL-19042: amel-quarkus-catalog - Uses 0.0.1 version
Posted by da...@apache.org.
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 <cl...@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();