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 2022/12/20 10:40:36 UTC
[camel] branch main updated (e284028d91a -> fd987b602c2)
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from e284028d91a Upgrade to Artemis 2.17.1
new bbc0f083afc camel-jbang - Fix potential NPE
new fd987b602c2 camel-jbang - Show version for catalog other
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:
.../org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java | 1 +
.../apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java | 3 +++
2 files changed, 4 insertions(+)
[camel] 02/02: camel-jbang - Show version for catalog other
Posted by da...@apache.org.
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
commit fd987b602c2a77b410a040b1bd3fc7d62d20fcfb
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 20 11:40:22 2022 +0100
camel-jbang - Show version for catalog other
---
.../org/apache/camel/dsl/jbang/core/commands/catalog/CatalogOther.java | 1 +
1 file changed, 1 insertion(+)
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 403b5f3d763..8b3b4e8a448 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
@@ -40,6 +40,7 @@ public class CatalogOther extends CatalogBaseCommand {
row.name = model.getName();
row.title = model.getTitle();
row.level = model.getSupportLevel().name();
+ row.since = model.getFirstVersionShort();
row.description = model.getDescription();
row.label = model.getLabel() != null ? model.getLabel() : "";
row.deprecated = model.isDeprecated();
[camel] 01/02: camel-jbang - Fix potential NPE
Posted by da...@apache.org.
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
commit bbc0f083afcac1c7644a002a0c9a91b3291e673b
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Tue Dec 20 11:38:16 2022 +0100
camel-jbang - Fix potential NPE
---
.../apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java | 3 +++
1 file changed, 3 insertions(+)
diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
index 20985ddf161..587a56b70d8 100644
--- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
+++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/catalog/VersionHelper.java
@@ -24,6 +24,9 @@ final class VersionHelper {
}
public static boolean isGE(String source, String target) {
+ if (source == null || target == null) {
+ return false;
+ }
String s1 = StringHelper.before(source, ".");
String s2 = StringHelper.after(source, ".");
if (s1 == null) {