From 63721ff79e763ff4f22a60411b3d00d707ba94b2 Mon Sep 17 00:00:00 2001 From: Tom Cunningham Date: Fri, 1 May 2026 08:37:54 -0400 Subject: [PATCH 1/2] Remove hardcoded camel / camel-kamelets versions from citrus-application.properties and ensure that the camel and camel-kamelets versions are kept in line with the current state of the project (use maven's ${camel.version} and ${project.version} --- tests/camel-kamelets-itest/pom.xml | 12 ++++++++++++ .../citrus-application.properties | 4 ++-- .../resources/avro/avro-data-type.citrus.it.yaml | 4 ++++ .../resources/avro/avro-serdes-action.citrus.it.yaml | 4 ++++ 4 files changed, 22 insertions(+), 2 deletions(-) rename tests/camel-kamelets-itest/src/test/{resources => resources-filtered}/citrus-application.properties (93%) diff --git a/tests/camel-kamelets-itest/pom.xml b/tests/camel-kamelets-itest/pom.xml index 955c61039..08117d7dc 100644 --- a/tests/camel-kamelets-itest/pom.xml +++ b/tests/camel-kamelets-itest/pom.xml @@ -186,6 +186,18 @@ + + + + src/test/resources + false + + + + src/test/resources-filtered + true + + org.apache.maven.plugins diff --git a/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties b/tests/camel-kamelets-itest/src/test/resources-filtered/citrus-application.properties similarity index 93% rename from tests/camel-kamelets-itest/src/test/resources/citrus-application.properties rename to tests/camel-kamelets-itest/src/test/resources-filtered/citrus-application.properties index 231a73612..970d0593b 100644 --- a/tests/camel-kamelets-itest/src/test/resources/citrus-application.properties +++ b/tests/camel-kamelets-itest/src/test/resources-filtered/citrus-application.properties @@ -25,9 +25,9 @@ citrus.cluster.type=local citrus.camel.jbang.max.attempts=10 # Camel JBang version (should align with version used in pom.xml) -citrus.camel.jbang.version=4.20.0-SNAPSHOT +citrus.camel.jbang.version=${camel.version} # Kamelets version (should point to the current snapshot release version) -citrus.camel.jbang.kamelets.version=4.20.0-SNAPSHOT +citrus.camel.jbang.kamelets.version=${project.version} # Enable dump of Camel JBang integration output citrus.camel.jbang.dump.integration.output=true diff --git a/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml index 657893b0f..c7590151c 100644 --- a/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml @@ -20,6 +20,10 @@ variables: - name: "uuid" value: citrus:randomUUID() actions: + - echo: + message: "Camel JBang version: citrus:env('citrus.camel.jbang.version')" + - echo: + message: "Kamelets version: citrus:env('citrus.camel.jbang.kamelets.version')" - camel: jbang: run: diff --git a/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml index 9548ccaf0..834b4e7f1 100644 --- a/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml @@ -20,6 +20,10 @@ variables: - name: "uuid" value: citrus:randomUUID() actions: + - echo: + message: "Camel JBang version: citrus:env('citrus.camel.jbang.version')" + - echo: + message: "Kamelets version: citrus:env('citrus.camel.jbang.kamelets.version')" - camel: jbang: run: From bcf31c8dcb65650ac7253996f2fc02cc2eac86f5 Mon Sep 17 00:00:00 2001 From: Tom Cunningham Date: Fri, 1 May 2026 11:08:53 -0400 Subject: [PATCH 2/2] Remove use of env function --- .../src/test/resources/avro/avro-data-type.citrus.it.yaml | 8 ++++++-- .../test/resources/avro/avro-serdes-action.citrus.it.yaml | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml index c7590151c..b12643eda 100644 --- a/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml @@ -19,11 +19,15 @@ name: avro-data-type-test variables: - name: "uuid" value: citrus:randomUUID() + - name: "camelVersion" + value: "citrus:systemProperty('citrus.camel.jbang.version')" + - name: "kameletsVersion" + value: "citrus:systemProperty('citrus.camel.jbang.kamelets.version')" actions: - echo: - message: "Camel JBang version: citrus:env('citrus.camel.jbang.version')" + message: "Camel JBang version: ${camelVersion}" - echo: - message: "Kamelets version: citrus:env('citrus.camel.jbang.kamelets.version')" + message: "Kamelets version: ${kameletsVersion}" - camel: jbang: run: diff --git a/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml index 834b4e7f1..d1d6f5355 100644 --- a/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml @@ -19,11 +19,15 @@ name: avro-serdes-action-test variables: - name: "uuid" value: citrus:randomUUID() + - name: "camelVersion" + value: "citrus:systemProperty('citrus.camel.jbang.version')" + - name: "kameletsVersion" + value: "citrus:systemProperty('citrus.camel.jbang.kamelets.version')" actions: - echo: - message: "Camel JBang version: citrus:env('citrus.camel.jbang.version')" + message: "Camel JBang version: ${camelVersion}" - echo: - message: "Kamelets version: citrus:env('citrus.camel.jbang.kamelets.version')" + message: "Kamelets version: ${kameletsVersion}" - camel: jbang: run: