(camel) branch main updated: Camel JBang test infra: fix version info

[fmariani]

This is an automated email from the ASF dual-hosted git repository.

fmariani 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 ea3c9f8ddb8 Camel JBang test infra: fix version info
ea3c9f8ddb8 is described below

commit ea3c9f8ddb8af0ab7149fa0b5897a3f06c633537
Author: Marco Carletti <mcarl...@redhat.com>
AuthorDate: Tue Feb 6 14:37:51 2024 +0100

    Camel JBang test infra: fix version info
---
 .../camel/test/infra/cli/services/CliLocalContainerService.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git 
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
 
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
index b16af9b6547..c42cc9cbee2 100644
--- 
a/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
+++ 
b/test-infra/camel-test-infra-cli/src/test/java/org/apache/camel/test/infra/cli/services/CliLocalContainerService.java
@@ -175,9 +175,12 @@ public class CliLocalContainerService implements 
CliService, ContainerService<Cl
     public String version() {
         return Optional.ofNullable(version)
                 .orElseGet(() -> {
-                    version = 
StringUtils.substringAfterLast(execute("version"), ":").trim();
-                    if (version.contains("camel-version = ")) {
-                        version = StringUtils.substringAfter(version, 
"camel-version = ").trim();
+                    final String versionSummary = execute("version");
+                    if (versionSummary.contains("User configuration") && 
versionSummary.contains("camel-version = ")) {
+                        version = StringUtils.substringBetween(versionSummary, 
"camel-version = ", "\n").trim();
+                    }
+                    if (version == null) {
+                        version = StringUtils.substringBetween(versionSummary, 
"Camel JBang version:", "\n").trim();
                     }
                     return version;
                 });