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 9831df4a650b4a8ca22fb0a752f2a6cb467046c1 Author: Claus Ibsen <[email protected]> AuthorDate: Tue Jul 7 09:34:42 2026 +0200 Upgrade kamelet and fix a potential NPE --- parent/pom.xml | 2 +- .../camel/test/infra/cli/services/CliLocalProcessService.java | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index e78393afdff1..8a163e365246 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -95,7 +95,7 @@ <californium-scandium-version>3.14.0</californium-scandium-version> <!-- jbang edit command which uses embedded kamelets catalog --> <camel-lsp-version>1.34.0</camel-lsp-version> - <camel-kamelets-catalog-version>4.20.0</camel-kamelets-catalog-version> + <camel-kamelets-catalog-version>4.21.0</camel-kamelets-catalog-version> <camunda-version>7.24.0</camunda-version> <camunda-client-java-version>8.9.11</camunda-client-java-version> <cassandra-driver-version>4.19.3</cassandra-driver-version> diff --git a/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java index 7778006dbab5..d24d1766cb4e 100644 --- a/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java +++ b/test-infra/camel-test-infra-cli/src/main/java/org/apache/camel/test/infra/cli/services/CliLocalProcessService.java @@ -341,10 +341,16 @@ public class CliLocalProcessService implements CliService { .orElseGet(() -> { final String versionSummary = execute("version"); if (versionSummary.contains("User configuration") && versionSummary.contains("camel-version = ")) { - version = StringHelper.between(versionSummary, "camel-version = ", "\n").trim(); + String v = StringHelper.between(versionSummary, "camel-version = ", "\n"); + if (v != null) { + version = v.trim(); + } } if (version == null) { - version = StringHelper.between(versionSummary, "Camel CLI version:", "\n").trim(); + String v = StringHelper.between(versionSummary, "Camel CLI version:", "\n"); + if (v != null) { + version = v.trim(); + } } return version; });
