From 03ee059cccaba174b8aac27b26ddca238dbd38e2 Mon Sep 17 00:00:00 2001 From: Christoph Deppisch Date: Wed, 5 Aug 2026 18:36:22 +0200 Subject: [PATCH] chore(deps): Update to Citrus 5.0.0 Co-Authored-By: Claude Opus 4.6 --- pom.xml | 2 +- tests/camel-kamelets-itest/pom.xml | 2 +- tests/camel-kamelets-itest/src/test/java/AvroIT.java | 2 +- tests/camel-kamelets-itest/src/test/java/AwsIT.java | 2 +- .../src/test/java/CassandraIT.java | 2 +- .../camel-kamelets-itest/src/test/java/CommonIT.java | 2 +- tests/camel-kamelets-itest/src/test/java/JiraIT.java | 2 +- .../camel-kamelets-itest/src/test/java/KafkaIT.java | 4 ++-- tests/camel-kamelets-itest/src/test/java/MailIT.java | 2 +- .../camel-kamelets-itest/src/test/java/MongoIT.java | 2 +- .../camel-kamelets-itest/src/test/java/Mqtt5IT.java | 2 +- tests/camel-kamelets-itest/src/test/java/NatsIT.java | 2 +- .../src/test/java/OpenApiIT.java | 2 +- .../src/test/java/PostgresIT.java | 2 +- .../src/test/java/ProtobufIT.java | 2 +- .../camel-kamelets-itest/src/test/java/RedisIT.java | 2 +- .../camel-kamelets-itest/src/test/java/SlackIT.java | 2 +- .../resources-filtered/citrus-application.properties | 12 ++++++------ .../resources/avro/avro-data-type.citrus.it.yaml | 10 +++++----- .../resources/avro/avro-serdes-action.citrus.it.yaml | 10 +++++----- .../aws/ddb/aws-ddb-sink-delete-item.citrus.it.yaml | 2 +- .../aws/ddb/aws-ddb-sink-put-item.citrus.it.yaml | 2 +- .../resources/aws/ddb/aws-ddb-source.citrus.it.yaml | 4 ++-- .../eventbridge/aws-eventbridge-sink.citrus.it.yaml | 6 +++--- .../aws/eventbridge/setupEventBridge.groovy | 2 +- .../aws/kinesis/aws-kinesis-sink.citrus.it.yaml | 6 +++--- .../aws/kinesis/aws-kinesis-source.citrus.it.yaml | 4 ++-- .../aws/s3/aws-s3-sink-route.citrus.it.yaml | 4 ++-- .../resources/aws/s3/aws-s3-to-http.citrus.it.yaml | 6 +++--- .../aws/s3/aws-s3-to-log-uri-based.citrus.it.yaml | 4 ++-- .../resources/aws/s3/aws-s3-uri-pipe.citrus.it.yaml | 4 ++-- .../aws/sns/aws-sns-sink-route.citrus.it.yaml | 6 +++--- .../aws/sqs/aws-sqs-sink-route.citrus.it.yaml | 6 +++--- .../aws/sqs/aws-sqs-to-log-uri-based.citrus.it.yaml | 4 ++-- .../aws/sqs/aws-sqs-uri-pipe.citrus.it.yaml | 4 ++-- .../counter/counter-source-pipe.citrus.it.yaml | 4 ++-- .../resources/cron/cron-source-route.citrus.it.yaml | 4 ++-- .../crypto/crypto-action-pipe.citrus.it.yaml | 2 +- .../delay/delay-action-route.citrus.it.yaml | 2 +- .../resources/dns/dns-ip-action-route.citrus.it.yaml | 4 ++-- .../earthquake/earthquake-to-http.citrus.it.yaml | 2 +- .../has-header-filter-action-pipe.citrus.it.yaml | 2 +- .../predicate-filter-action-pipe.citrus.it.yaml | 2 +- .../filter/simple-filter-action-route.citrus.it.yaml | 2 +- .../header/insert-header-action-pipe.citrus.it.yaml | 2 +- .../resources/http/http-sink-pipe.citrus.it.yaml | 2 +- .../http/http-source-to-http.citrus.it.yaml | 2 +- .../jira/jira-add-comment-sink-pipe.citrus.it.yaml | 4 ++-- .../jira/jira-add-issue-sink-pipe.citrus.it.yaml | 4 ++-- .../resources/jira/jira-source-pipe.citrus.it.yaml | 4 ++-- .../resources/kafka/kafka-router-pipe.citrus.it.yaml | 2 +- .../resources/kafka/kafka-sink-pipe.citrus.it.yaml | 2 +- .../resources/kafka/kafka-source-pipe.citrus.it.yaml | 4 ++-- .../regex-router-action-route.citrus.it.yaml | 4 ++-- .../timestamp-router-action-route.citrus.it.yaml | 4 ++-- ...c-name-matches-filter-action-route.citrus.it.yaml | 4 ++-- .../test/resources/log/log-sink-pipe.citrus.it.yaml | 4 ++-- .../resources/mail/mail-sink-pipe.citrus.it.yaml | 6 +----- .../mongo/mongodb-sink-route.citrus.it.yaml | 4 ++-- .../mongo/mongodb-source-route.citrus.it.yaml | 4 ++-- .../openapi/rest-openapi-sink-add-pet.citrus.it.yaml | 2 +- .../rest-openapi-sink-delete-pet.citrus.it.yaml | 2 +- .../postgres/postgresql-sink-route.citrus.it.yaml | 4 ++-- .../postgres/postgresql-source-route.citrus.it.yaml | 4 ++-- .../protobuf/protobuf-data-type.citrus.it.yaml | 6 +++--- .../protobuf/protobuf-serdes-action.citrus.it.yaml | 6 +++--- .../setbody/set-body-action-route.citrus.it.yaml | 2 +- .../resources/slack/slack-sink-pipe.citrus.it.yaml | 6 +++--- .../resources/slack/slack-source-pipe.citrus.it.yaml | 4 ++-- .../throttle/throttle-action-route.citrus.it.yaml | 2 +- .../timer/timer-to-http-pipe.citrus.it.yaml | 2 +- .../resources/timer/timer-to-http.citrus.it.yaml | 4 ++-- .../data-type-action-pipe.citrus.it.yaml | 2 +- .../drop-field-action-pipe.citrus.it.yaml | 2 +- .../extract-field-action-pipe.citrus.it.yaml | 2 +- .../hoist-field-action-pipe.citrus.it.yaml | 2 +- .../insert-field-action-pipe.citrus.it.yaml | 2 +- .../mask-field-action-pipe.citrus.it.yaml | 2 +- .../replace-field-action-pipe.citrus.it.yaml | 2 +- .../xj/xj-identity-action-route.citrus.it.yaml | 4 ++-- 80 files changed, 135 insertions(+), 139 deletions(-) diff --git a/pom.xml b/pom.xml index 027d970a5..a34fb9763 100644 --- a/pom.xml +++ b/pom.xml @@ -75,7 +75,7 @@ 4.21.0 - 4.10.3 + 5.0.0 0.9.6 diff --git a/tests/camel-kamelets-itest/pom.xml b/tests/camel-kamelets-itest/pom.xml index ffbd1b0d2..246907a1d 100644 --- a/tests/camel-kamelets-itest/pom.xml +++ b/tests/camel-kamelets-itest/pom.xml @@ -160,7 +160,7 @@ org.citrusframework - citrus-junit5 + citrus-junit-jupiter test diff --git a/tests/camel-kamelets-itest/src/test/java/AvroIT.java b/tests/camel-kamelets-itest/src/test/java/AvroIT.java index 41e7be04b..fb82ecadc 100644 --- a/tests/camel-kamelets-itest/src/test/java/AvroIT.java +++ b/tests/camel-kamelets-itest/src/test/java/AvroIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.container.SequenceBeforeTest; import org.citrusframework.junit.jupiter.CitrusSupport; import org.citrusframework.junit.jupiter.CitrusTestFactory; diff --git a/tests/camel-kamelets-itest/src/test/java/AwsIT.java b/tests/camel-kamelets-itest/src/test/java/AwsIT.java index b1a364815..d3b57d6d0 100644 --- a/tests/camel-kamelets-itest/src/test/java/AwsIT.java +++ b/tests/camel-kamelets-itest/src/test/java/AwsIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.container.SequenceAfterTest; import org.citrusframework.container.SequenceBeforeTest; import org.citrusframework.http.server.HttpServer; diff --git a/tests/camel-kamelets-itest/src/test/java/CassandraIT.java b/tests/camel-kamelets-itest/src/test/java/CassandraIT.java index d2a526ca0..9e9c801e5 100644 --- a/tests/camel-kamelets-itest/src/test/java/CassandraIT.java +++ b/tests/camel-kamelets-itest/src/test/java/CassandraIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.junit.jupiter.CitrusSupport; import org.citrusframework.junit.jupiter.CitrusTestFactory; import org.citrusframework.junit.jupiter.CitrusTestFactorySupport; diff --git a/tests/camel-kamelets-itest/src/test/java/CommonIT.java b/tests/camel-kamelets-itest/src/test/java/CommonIT.java index d3f35ae19..04124894b 100644 --- a/tests/camel-kamelets-itest/src/test/java/CommonIT.java +++ b/tests/camel-kamelets-itest/src/test/java/CommonIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.container.SequenceAfterTest; import org.citrusframework.container.SequenceBeforeTest; import org.citrusframework.http.server.HttpServer; diff --git a/tests/camel-kamelets-itest/src/test/java/JiraIT.java b/tests/camel-kamelets-itest/src/test/java/JiraIT.java index 2af65e546..b7fee11cc 100644 --- a/tests/camel-kamelets-itest/src/test/java/JiraIT.java +++ b/tests/camel-kamelets-itest/src/test/java/JiraIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.container.SequenceAfterTest; import org.citrusframework.container.SequenceBeforeTest; import org.citrusframework.http.server.HttpServer; diff --git a/tests/camel-kamelets-itest/src/test/java/KafkaIT.java b/tests/camel-kamelets-itest/src/test/java/KafkaIT.java index 2c619dbde..a80e53a33 100644 --- a/tests/camel-kamelets-itest/src/test/java/KafkaIT.java +++ b/tests/camel-kamelets-itest/src/test/java/KafkaIT.java @@ -18,8 +18,8 @@ import java.util.stream.Stream; import org.citrusframework.TestAction; -import org.citrusframework.common.ShutdownPhase; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.ShutdownPhase; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.container.SequenceAfterTest; import org.citrusframework.container.SequenceBeforeTest; import org.citrusframework.endpoint.Endpoint; diff --git a/tests/camel-kamelets-itest/src/test/java/MailIT.java b/tests/camel-kamelets-itest/src/test/java/MailIT.java index e7eca53de..cce4e1038 100644 --- a/tests/camel-kamelets-itest/src/test/java/MailIT.java +++ b/tests/camel-kamelets-itest/src/test/java/MailIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.junit.jupiter.CitrusSupport; import org.citrusframework.junit.jupiter.CitrusTestFactory; import org.citrusframework.junit.jupiter.CitrusTestFactorySupport; diff --git a/tests/camel-kamelets-itest/src/test/java/MongoIT.java b/tests/camel-kamelets-itest/src/test/java/MongoIT.java index 10ab25894..f30c362bf 100644 --- a/tests/camel-kamelets-itest/src/test/java/MongoIT.java +++ b/tests/camel-kamelets-itest/src/test/java/MongoIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.junit.jupiter.CitrusSupport; import org.citrusframework.junit.jupiter.CitrusTestFactory; import org.citrusframework.junit.jupiter.CitrusTestFactorySupport; diff --git a/tests/camel-kamelets-itest/src/test/java/Mqtt5IT.java b/tests/camel-kamelets-itest/src/test/java/Mqtt5IT.java index 19e137cb9..1d07cb4af 100644 --- a/tests/camel-kamelets-itest/src/test/java/Mqtt5IT.java +++ b/tests/camel-kamelets-itest/src/test/java/Mqtt5IT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.junit.jupiter.CitrusSupport; import org.citrusframework.junit.jupiter.CitrusTestFactory; import org.citrusframework.junit.jupiter.CitrusTestFactorySupport; diff --git a/tests/camel-kamelets-itest/src/test/java/NatsIT.java b/tests/camel-kamelets-itest/src/test/java/NatsIT.java index a7c768685..015b63df9 100644 --- a/tests/camel-kamelets-itest/src/test/java/NatsIT.java +++ b/tests/camel-kamelets-itest/src/test/java/NatsIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.junit.jupiter.CitrusSupport; import org.citrusframework.junit.jupiter.CitrusTestFactory; import org.citrusframework.junit.jupiter.CitrusTestFactorySupport; diff --git a/tests/camel-kamelets-itest/src/test/java/OpenApiIT.java b/tests/camel-kamelets-itest/src/test/java/OpenApiIT.java index f35586b67..18a212b3d 100644 --- a/tests/camel-kamelets-itest/src/test/java/OpenApiIT.java +++ b/tests/camel-kamelets-itest/src/test/java/OpenApiIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.container.SequenceAfterTest; import org.citrusframework.container.SequenceBeforeTest; import org.citrusframework.http.server.HttpServer; diff --git a/tests/camel-kamelets-itest/src/test/java/PostgresIT.java b/tests/camel-kamelets-itest/src/test/java/PostgresIT.java index 2b8f63e76..0bdb082ef 100644 --- a/tests/camel-kamelets-itest/src/test/java/PostgresIT.java +++ b/tests/camel-kamelets-itest/src/test/java/PostgresIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.junit.jupiter.CitrusSupport; import org.citrusframework.junit.jupiter.CitrusTestFactory; import org.citrusframework.junit.jupiter.CitrusTestFactorySupport; diff --git a/tests/camel-kamelets-itest/src/test/java/ProtobufIT.java b/tests/camel-kamelets-itest/src/test/java/ProtobufIT.java index c75c1e186..84a7af5dd 100644 --- a/tests/camel-kamelets-itest/src/test/java/ProtobufIT.java +++ b/tests/camel-kamelets-itest/src/test/java/ProtobufIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.container.SequenceBeforeTest; import org.citrusframework.junit.jupiter.CitrusSupport; import org.citrusframework.junit.jupiter.CitrusTestFactory; diff --git a/tests/camel-kamelets-itest/src/test/java/RedisIT.java b/tests/camel-kamelets-itest/src/test/java/RedisIT.java index 8653a1faa..7473f5bdc 100644 --- a/tests/camel-kamelets-itest/src/test/java/RedisIT.java +++ b/tests/camel-kamelets-itest/src/test/java/RedisIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.junit.jupiter.CitrusSupport; import org.citrusframework.junit.jupiter.CitrusTestFactory; import org.citrusframework.junit.jupiter.CitrusTestFactorySupport; diff --git a/tests/camel-kamelets-itest/src/test/java/SlackIT.java b/tests/camel-kamelets-itest/src/test/java/SlackIT.java index c89ccaf93..86c0dd601 100644 --- a/tests/camel-kamelets-itest/src/test/java/SlackIT.java +++ b/tests/camel-kamelets-itest/src/test/java/SlackIT.java @@ -17,7 +17,7 @@ import java.util.stream.Stream; -import org.citrusframework.common.TestLoader; +import org.citrusframework.api.common.TestLoader; import org.citrusframework.container.SequenceBeforeTest; import org.citrusframework.http.server.HttpServer; import org.citrusframework.junit.jupiter.CitrusSupport; diff --git a/tests/camel-kamelets-itest/src/test/resources-filtered/citrus-application.properties b/tests/camel-kamelets-itest/src/test/resources-filtered/citrus-application.properties index 1d5528b21..033b35468 100644 --- a/tests/camel-kamelets-itest/src/test/resources-filtered/citrus-application.properties +++ b/tests/camel-kamelets-itest/src/test/resources-filtered/citrus-application.properties @@ -22,15 +22,15 @@ citrus.type.converter=camel citrus.mail.marshaller.type=JSON citrus.cluster.type=local -citrus.camel.jbang.max.attempts=10 +citrus.camel.cli.max.attempts=10 -# Camel JBang version (should align with version used in pom.xml) -citrus.camel.jbang.version=${camel.version} +# Camel CLI version (should align with version used in pom.xml) +citrus.camel.cli.version=${camel.version} # Kamelets version (should point to the current snapshot release version) -citrus.camel.jbang.kamelets.version=${project.version} +citrus.camel.cli.kamelets.version=${project.version} -# Enable dump of Camel JBang integration output -citrus.camel.jbang.dump.integration.output=true +# Enable dump of Camel CLI integration output +citrus.camel.cli.dump.integration.output=true # Use Floci as the AWS emulator (drop-in replacement for LocalStack) citrus.testcontainers.localstack.image.name=floci/floci 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 ddab21808..000dec811 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,16 +20,16 @@ variables: - name: "uuid" value: citrus:randomUUID() - name: "camelVersion" - value: "citrus:systemProperty('citrus.camel.jbang.version')" + value: "citrus:systemProperty('citrus.camel.cli.version')" - name: "kameletsVersion" - value: "citrus:systemProperty('citrus.camel.jbang.kamelets.version')" + value: "citrus:systemProperty('citrus.camel.cli.kamelets.version')" actions: - echo: message: "Camel JBang version: ${camelVersion}" - echo: message: "Kamelets version: ${kameletsVersion}" - camel: - jbang: + cli: run: args: - "--port" @@ -37,7 +37,7 @@ actions: integration: file: "avro/avro-x-struct-sink-pipe.yaml" - camel: - jbang: + cli: run: integration: file: "avro/avro-binary-source-pipe.yaml" @@ -49,7 +49,7 @@ actions: value: >- { \"id\": \"${uuid}\", \"firstname\": \"Sheldon\", \"lastname\": \"Cooper\", \"age\": 28 } - camel: - jbang: + cli: verify: integration: "avro-x-struct-sink-pipe" logMessage: | 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 37eb240d9..ad23bf058 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,16 +20,16 @@ variables: - name: "uuid" value: citrus:randomUUID() - name: "camelVersion" - value: "citrus:systemProperty('citrus.camel.jbang.version')" + value: "citrus:systemProperty('citrus.camel.cli.version')" - name: "kameletsVersion" - value: "citrus:systemProperty('citrus.camel.jbang.kamelets.version')" + value: "citrus:systemProperty('citrus.camel.cli.kamelets.version')" actions: - echo: message: "Camel JBang version: ${camelVersion}" - echo: message: "Kamelets version: ${kameletsVersion}" - camel: - jbang: + cli: run: args: - "--port" @@ -37,7 +37,7 @@ actions: integration: file: "avro/avro-deserialize-pipe.yaml" - camel: - jbang: + cli: run: integration: file: "avro/avro-serialize-pipe.yaml" @@ -49,7 +49,7 @@ actions: value: >- { \"id\": \"${uuid}\", \"firstname\": \"Sheldon\", \"lastname\": \"Cooper\", \"age\": 28 } - camel: - jbang: + cli: verify: integration: "avro-deserialize-pipe" logMessage: | diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.citrus.it.yaml index 84d2bda86..04d69eae1 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.citrus.it.yaml @@ -83,7 +83,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/ddb/aws-ddb-sink-route.yaml" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.citrus.it.yaml index d4d8b0b0b..2bea9d1fc 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.citrus.it.yaml @@ -70,7 +70,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/ddb/aws-ddb-sink-route.yaml" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.citrus.it.yaml index 0c309905b..df7749f50 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.citrus.it.yaml @@ -47,7 +47,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/ddb/aws-ddb-source-route.yaml" @@ -60,7 +60,7 @@ actions: # Verify AWS-DDB source - camel: - jbang: + cli: verify: integration: "aws-ddb-source-route" logMessage: | diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.citrus.it.yaml index cc197dcd0..6a6868ec7 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.citrus.it.yaml @@ -56,7 +56,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/eventbridge/aws-eventbridge-sink-route.yaml" @@ -70,7 +70,7 @@ actions: # Create event listener - camel: - jbang: + cli: run: integration: file: "aws/eventbridge/aws-sqs-event-listener-route.yaml" @@ -82,7 +82,7 @@ actions: # Verify event received - camel: - jbang: + cli: verify: integration: "aws-sqs-event-listener-route" logMessage: | diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/setupEventBridge.groovy b/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/setupEventBridge.groovy index 95d667361..08eb6f5dd 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/setupEventBridge.groovy +++ b/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/setupEventBridge.groovy @@ -31,7 +31,7 @@ * limitations under the License. */ -import org.citrusframework.actions.testcontainers.aws2.AwsService +import org.citrusframework.api.actions.testcontainers.aws2.AwsService import org.citrusframework.testcontainers.aws2.LocalStackContainer import software.amazon.awssdk.auth.credentials.AwsBasicCredentials import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.citrus.it.yaml index 01154a846..0b90a11ae 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.citrus.it.yaml @@ -49,7 +49,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/kinesis/aws-kinesis-sink-route.yaml" @@ -63,7 +63,7 @@ actions: # Create event listener - camel: - jbang: + cli: run: integration: file: "aws/kinesis/aws-kinesis-event-listener.yaml" @@ -72,7 +72,7 @@ actions: # Verify event received - camel: - jbang: + cli: verify: integration: "aws-kinesis-event-listener" logMessage: | diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.citrus.it.yaml index 0ef1ce273..45272cd39 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.citrus.it.yaml @@ -42,7 +42,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/kinesis/aws-kinesis-source-route.yaml" @@ -61,7 +61,7 @@ actions: # Verify AWS-KINESIS source - camel: - jbang: + cli: verify: integration: "aws-kinesis-source-route" logMessage: "${aws.kinesis.streamData}" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-sink-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-sink-route.citrus.it.yaml index f33d2bbe0..82ff43b96 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-sink-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-sink-route.citrus.it.yaml @@ -42,7 +42,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/s3/aws-s3-sink-route.yaml" @@ -56,7 +56,7 @@ actions: # Verify S3 sink wrote the object - camel: - jbang: + cli: verify: integration: "aws-s3-sink-route" logMessage: "${test.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.citrus.it.yaml index 58531f373..47c7c8c57 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.citrus.it.yaml @@ -42,7 +42,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/s3/aws-s3-source-to-http-route.yaml" @@ -68,7 +68,7 @@ actions: receiveRequest: POST: path: "/incoming" - contentType: "text/plain; charset=UTF-8" + contentType: "text/plain; charset=utf-8" headers: - name: ce-specversion value: "1.0" @@ -87,7 +87,7 @@ actions: # Verify AWS-S3 source - camel: - jbang: + cli: verify: integration: "aws-s3-source-to-http-route" logMessage: "${aws.s3.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.citrus.it.yaml index a78d56024..fac3a4a95 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.citrus.it.yaml @@ -42,7 +42,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/s3/aws-s3-to-log-uri-based.yaml" @@ -75,7 +75,7 @@ actions: # Verify AWS-S3 source - camel: - jbang: + cli: verify: integration: "aws-s3-to-log-uri-based" logMessage: "${aws.s3.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.citrus.it.yaml index 1a70bbcab..a740a19e5 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.citrus.it.yaml @@ -42,7 +42,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/s3/aws-s3-source-route.yaml" @@ -75,7 +75,7 @@ actions: # Verify AWS-S3 source - camel: - jbang: + cli: verify: integration: "aws-s3-source-route" logMessage: "${aws.s3.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sns/aws-sns-sink-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/sns/aws-sns-sink-route.citrus.it.yaml index 8d3f69e9b..bc2eacbdf 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/sns/aws-sns-sink-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/sns/aws-sns-sink-route.citrus.it.yaml @@ -42,7 +42,7 @@ actions: # Create Camel JBang integration for the SNS sink - camel: - jbang: + cli: run: integration: file: "aws/sns/aws-sns-sink-route.yaml" @@ -65,7 +65,7 @@ actions: # Create event listener to consume the message forwarded from SNS to SQS - camel: - jbang: + cli: run: integration: file: "aws/sns/aws-sqs-sns-event-listener.yaml" @@ -86,7 +86,7 @@ actions: # Verify message received by the SQS listener - camel: - jbang: + cli: verify: integration: "aws-sqs-sns-event-listener" logMessage: "${test.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-sink-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-sink-route.citrus.it.yaml index 51c27f994..9be676c95 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-sink-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-sink-route.citrus.it.yaml @@ -40,7 +40,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/sqs/aws-sqs-sink-route.yaml" @@ -63,7 +63,7 @@ actions: # Create event listener to consume the message from SQS - camel: - jbang: + cli: run: integration: file: "aws/sqs/aws-sqs-sink-event-listener.yaml" @@ -84,7 +84,7 @@ actions: # Verify message received by the listener - camel: - jbang: + cli: verify: integration: "aws-sqs-sink-event-listener" logMessage: "${test.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.citrus.it.yaml index 2c95af6f8..2b30bd631 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.citrus.it.yaml @@ -40,7 +40,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/sqs/aws-sqs-to-log-uri-based.yaml" @@ -68,7 +68,7 @@ actions: # Verify AWS-SQS source - camel: - jbang: + cli: verify: integration: "aws-sqs-to-log-uri-based" logMessage: "${aws.sqs.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.citrus.it.yaml index 83385e3d4..7721f0cb5 100644 --- a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.citrus.it.yaml @@ -40,7 +40,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "aws/sqs/aws-sqs-source-route.yaml" @@ -68,7 +68,7 @@ actions: # Verify AWS-SQS source - camel: - jbang: + cli: verify: integration: "aws-sqs-source-route" logMessage: "${aws.sqs.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml index 0bafa7a21..8edfda446 100644 --- a/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/counter/counter-source-pipe.citrus.it.yaml @@ -19,7 +19,7 @@ name: counter-source-pipe-test actions: # Run the counter-source -> log-sink Pipe via Camel JBang - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -27,7 +27,7 @@ actions: # Verify the generated sequential number reaches the log sink - camel: - jbang: + cli: verify: integration: "counter-source-pipe" logMessage: "777777" diff --git a/tests/camel-kamelets-itest/src/test/resources/cron/cron-source-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/cron/cron-source-route.citrus.it.yaml index 5a5ba0319..f4979534d 100644 --- a/tests/camel-kamelets-itest/src/test/resources/cron/cron-source-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/cron/cron-source-route.citrus.it.yaml @@ -18,13 +18,13 @@ name: cron-source-route-test actions: - camel: - jbang: + cli: run: waitForRunningState: false integration: file: "cron/cron-source-route.yaml" - camel: - jbang: + cli: verify: integration: "cron-source-route" logMessage: "cron-test-12345" diff --git a/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.citrus.it.yaml index 7b35dd2e5..86acf71a2 100644 --- a/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/crypto/crypto-action-pipe.citrus.it.yaml @@ -30,7 +30,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/delay/delay-action-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/delay/delay-action-route.citrus.it.yaml index 569faf74a..164485ea4 100644 --- a/tests/camel-kamelets-itest/src/test/resources/delay/delay-action-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/delay/delay-action-route.citrus.it.yaml @@ -21,7 +21,7 @@ variables: value: "delayed-message-test" actions: - camel: - jbang: + cli: run: integration: file: "delay/delay-action-route.yaml" diff --git a/tests/camel-kamelets-itest/src/test/resources/dns/dns-ip-action-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/dns/dns-ip-action-route.citrus.it.yaml index efc034888..8545a0e19 100644 --- a/tests/camel-kamelets-itest/src/test/resources/dns/dns-ip-action-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/dns/dns-ip-action-route.citrus.it.yaml @@ -18,13 +18,13 @@ name: dns-ip-action-route-test actions: - camel: - jbang: + cli: run: waitForRunningState: false integration: file: "dns/dns-ip-action-route.yaml" - camel: - jbang: + cli: verify: integration: "dns-ip-action-route" logMessage: "127.0.0.1" diff --git a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.citrus.it.yaml index 6198599e7..b02ba7b83 100644 --- a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.citrus.it.yaml @@ -19,7 +19,7 @@ name: earthquake-to-http-test actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "earthquake/earthquake-to-http.yaml" diff --git a/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.citrus.it.yaml index 8885c8511..09d78faaf 100644 --- a/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/filter/has-header-filter-action-pipe.citrus.it.yaml @@ -30,7 +30,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.citrus.it.yaml index 063a5c599..df779ac3c 100644 --- a/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/filter/predicate-filter-action-pipe.citrus.it.yaml @@ -26,7 +26,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/filter/simple-filter-action-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/filter/simple-filter-action-route.citrus.it.yaml index 8961a0963..caee0857f 100644 --- a/tests/camel-kamelets-itest/src/test/resources/filter/simple-filter-action-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/filter/simple-filter-action-route.citrus.it.yaml @@ -21,7 +21,7 @@ variables: value: "passthrough-message" actions: - camel: - jbang: + cli: run: integration: file: "filter/simple-filter-action-route.yaml" diff --git a/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.citrus.it.yaml index 1cdbeaec8..7e4ef59f3 100644 --- a/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/header/insert-header-action-pipe.citrus.it.yaml @@ -30,7 +30,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.citrus.it.yaml index 34c019db7..aeb5f64f8 100644 --- a/tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/http/http-sink-pipe.citrus.it.yaml @@ -26,7 +26,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/http/http-source-to-http.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/http/http-source-to-http.citrus.it.yaml index 1cf3ba809..1a3c1f4ed 100644 --- a/tests/camel-kamelets-itest/src/test/resources/http/http-source-to-http.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/http/http-source-to-http.citrus.it.yaml @@ -26,7 +26,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.citrus.it.yaml index c029bfe6c..97a6a7e7e 100644 --- a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.citrus.it.yaml @@ -50,7 +50,7 @@ actions: value: "http://localhost:${jira.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -213,7 +213,7 @@ actions: # Verify JIRA source - camel: - jbang: + cli: verify: integration: "jira-add-comment-sink-pipe" logMessage: "${jira.issue.comment}" diff --git a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.citrus.it.yaml index e93bc2c7f..c49598a07 100644 --- a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.citrus.it.yaml @@ -46,7 +46,7 @@ actions: value: "http://localhost:${jira.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -161,7 +161,7 @@ actions: # Verify JIRA source - camel: - jbang: + cli: verify: integration: "jira-add-issue-sink-pipe" logMessage: "${jira.issue.summary}" diff --git a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.citrus.it.yaml index 237e6bda7..e5eb078fa 100644 --- a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.citrus.it.yaml @@ -38,7 +38,7 @@ actions: value: "http://localhost:${jira.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -214,7 +214,7 @@ actions: # Verify JIRA source - camel: - jbang: + cli: verify: integration: "jira-source-pipe" logMessage: "${jira.issue.summary}" diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.citrus.it.yaml index c196bdd12..04ab832e0 100644 --- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.citrus.it.yaml @@ -35,7 +35,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: args: - "--port" diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.citrus.it.yaml index 5c7eaef92..5f10ca1af 100644 --- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.citrus.it.yaml @@ -33,7 +33,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "kafka/kafka-sink-pipe.yaml" diff --git a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml index 3ecc5be92..5f392f370 100644 --- a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml @@ -35,7 +35,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "kafka/kafka-source-pipe.yaml" @@ -47,7 +47,7 @@ actions: # Verify topic subscription - camel: - jbang: + cli: verify: integration: "kafka-source-pipe" logMessage: "Subscribed to topic(s): ${kafka.topic}" diff --git a/tests/camel-kamelets-itest/src/test/resources/kafkarouter/regex-router-action-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/kafkarouter/regex-router-action-route.citrus.it.yaml index 3e3841936..29586c156 100644 --- a/tests/camel-kamelets-itest/src/test/resources/kafkarouter/regex-router-action-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/kafkarouter/regex-router-action-route.citrus.it.yaml @@ -18,13 +18,13 @@ name: regex-router-action-route-test actions: - camel: - jbang: + cli: run: waitForRunningState: false integration: file: "kafkarouter/regex-router-action-route.yaml" - camel: - jbang: + cli: verify: integration: "regex-router-action-route" logMessage: "prefix-my-topic" diff --git a/tests/camel-kamelets-itest/src/test/resources/kafkarouter/timestamp-router-action-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/kafkarouter/timestamp-router-action-route.citrus.it.yaml index 8eaf1493e..ace63fd15 100644 --- a/tests/camel-kamelets-itest/src/test/resources/kafkarouter/timestamp-router-action-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/kafkarouter/timestamp-router-action-route.citrus.it.yaml @@ -18,13 +18,13 @@ name: timestamp-router-action-route-test actions: - camel: - jbang: + cli: run: waitForRunningState: false integration: file: "kafkarouter/timestamp-router-action-route.yaml" - camel: - jbang: + cli: verify: integration: "timestamp-router-action-route" logMessage: "my-topic-20240703" diff --git a/tests/camel-kamelets-itest/src/test/resources/kafkarouter/topic-name-matches-filter-action-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/kafkarouter/topic-name-matches-filter-action-route.citrus.it.yaml index e7a34f111..845fbd2d1 100644 --- a/tests/camel-kamelets-itest/src/test/resources/kafkarouter/topic-name-matches-filter-action-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/kafkarouter/topic-name-matches-filter-action-route.citrus.it.yaml @@ -18,13 +18,13 @@ name: topic-name-matches-filter-action-route-test actions: - camel: - jbang: + cli: run: waitForRunningState: false integration: file: "kafkarouter/topic-name-matches-filter-action-route.yaml" - camel: - jbang: + cli: verify: integration: "topic-name-matches-filter-action-route" logMessage: "topic-filter-test-data" diff --git a/tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.citrus.it.yaml index 01f9a98d7..0c0cf0c51 100644 --- a/tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/log/log-sink-pipe.citrus.it.yaml @@ -22,7 +22,7 @@ variables: actions: # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -34,7 +34,7 @@ actions: # Verify the log output contains the message - camel: - jbang: + cli: verify: integration: "log-sink-pipe" logMessage: "${log.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.citrus.it.yaml index a5332e19d..9ee12e74c 100644 --- a/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.citrus.it.yaml @@ -41,7 +41,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: integration: file: "mail/mail-sink-pipe.yaml" @@ -65,13 +65,9 @@ actions: { "from": "${mail.from}", "to": "${mail.to}", - "cc": null, - "bcc": null, - "replyTo": "@ignore@", "subject": "${mail.subject}", "body": { "contentType": "text/plain", "content": "${mail.message}", - "attachments": null } } diff --git a/tests/camel-kamelets-itest/src/test/resources/mongo/mongodb-sink-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/mongo/mongodb-sink-route.citrus.it.yaml index 616c9bc41..892ac025c 100644 --- a/tests/camel-kamelets-itest/src/test/resources/mongo/mongodb-sink-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/mongo/mongodb-sink-route.citrus.it.yaml @@ -24,7 +24,7 @@ actions: # Create Camel JBang integration (sink) - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -34,7 +34,7 @@ actions: # Verify MongoDB sink executed - camel: - jbang: + cli: verify: integration: "mongodb-sink-route" logMessage: "hello-mongodb" diff --git a/tests/camel-kamelets-itest/src/test/resources/mongo/mongodb-source-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/mongo/mongodb-source-route.citrus.it.yaml index 3e7fed3af..4dcf9ab0e 100644 --- a/tests/camel-kamelets-itest/src/test/resources/mongo/mongodb-source-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/mongo/mongodb-source-route.citrus.it.yaml @@ -29,7 +29,7 @@ actions: # Create Camel JBang integration (source) - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -39,7 +39,7 @@ actions: # Verify MongoDB source picked up the document - camel: - jbang: + cli: verify: integration: "mongodb-source-route" logMessage: "hello-from-mongo" diff --git a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml index 45c8f358f..45779231b 100644 --- a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml @@ -28,7 +28,7 @@ variables: actions: # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml index 706644bc2..c6f48870e 100644 --- a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml @@ -28,7 +28,7 @@ variables: actions: # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/postgres/postgresql-sink-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/postgres/postgresql-sink-route.citrus.it.yaml index 2e849b44e..3a0e96052 100644 --- a/tests/camel-kamelets-itest/src/test/resources/postgres/postgresql-sink-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/postgres/postgresql-sink-route.citrus.it.yaml @@ -29,7 +29,7 @@ actions: # Create Camel JBang integration (sink) - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -39,7 +39,7 @@ actions: # Verify PostgreSQL sink executed - camel: - jbang: + cli: verify: integration: "postgresql-sink-route" logMessage: "from-sink" diff --git a/tests/camel-kamelets-itest/src/test/resources/postgres/postgresql-source-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/postgres/postgresql-source-route.citrus.it.yaml index dfeebc429..38ce6bd21 100644 --- a/tests/camel-kamelets-itest/src/test/resources/postgres/postgresql-source-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/postgres/postgresql-source-route.citrus.it.yaml @@ -29,7 +29,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -39,7 +39,7 @@ actions: # Verify PostgreSQL source - camel: - jbang: + cli: verify: integration: "postgresql-source-route" logMessage: "hello-postgres" diff --git a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-data-type.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-data-type.citrus.it.yaml index 2ec55e5be..7e78039fe 100644 --- a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-data-type.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-data-type.citrus.it.yaml @@ -21,7 +21,7 @@ variables: value: citrus:randomUUID() actions: - camel: - jbang: + cli: run: args: - "--port" @@ -29,7 +29,7 @@ actions: integration: file: "protobuf/protobuf-x-struct-sink-pipe.yaml" - camel: - jbang: + cli: run: integration: file: "protobuf/protobuf-binary-source-pipe.yaml" @@ -41,7 +41,7 @@ actions: value: >- { \"id\": \"${uuid}\", \"firstname\": \"Sheldon\", \"lastname\": \"Cooper\", \"age\": 28 } - camel: - jbang: + cli: verify: integration: "protobuf-x-struct-sink-pipe" logMessage: | diff --git a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-serdes-action.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-serdes-action.citrus.it.yaml index 8eb7e21f5..6196fab30 100644 --- a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-serdes-action.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-serdes-action.citrus.it.yaml @@ -21,7 +21,7 @@ variables: value: citrus:randomUUID() actions: - camel: - jbang: + cli: run: args: - "--port" @@ -29,7 +29,7 @@ actions: integration: file: "protobuf/protobuf-deserialize-pipe.yaml" - camel: - jbang: + cli: run: integration: file: "protobuf/protobuf-serialize-pipe.yaml" @@ -41,7 +41,7 @@ actions: value: >- { \"id\": \"${uuid}\", \"firstname\": \"Sheldon\", \"lastname\": \"Cooper\", \"age\": 28 } - camel: - jbang: + cli: verify: integration: "protobuf-deserialize-pipe" logMessage: | diff --git a/tests/camel-kamelets-itest/src/test/resources/setbody/set-body-action-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/setbody/set-body-action-route.citrus.it.yaml index 1098bab2a..47d20ba79 100644 --- a/tests/camel-kamelets-itest/src/test/resources/setbody/set-body-action-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/setbody/set-body-action-route.citrus.it.yaml @@ -21,7 +21,7 @@ variables: value: "Replaced body content" actions: - camel: - jbang: + cli: run: integration: file: "setbody/set-body-action-route.yaml" diff --git a/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml index 751812b6b..4225edd6e 100644 --- a/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml @@ -37,7 +37,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -56,7 +56,7 @@ actions: receiveRequest: POST: path: "/" - contentType: "application/json; charset=UTF-8" + contentType: "application/json; charset=utf-8" body: data: | { @@ -74,7 +74,7 @@ actions: # Verify Slack sink - camel: - jbang: + cli: verify: integration: "slack-sink-pipe" logMessage: "${slack.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.citrus.it.yaml index 3d16aa362..3ef6e7ce3 100644 --- a/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.citrus.it.yaml @@ -35,7 +35,7 @@ actions: # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -122,7 +122,7 @@ actions: # Verify Slack source - camel: - jbang: + cli: verify: integration: "slack-source-pipe" logMessage: "${slack.message}" diff --git a/tests/camel-kamelets-itest/src/test/resources/throttle/throttle-action-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/throttle/throttle-action-route.citrus.it.yaml index 932c254f4..a806ec0bf 100644 --- a/tests/camel-kamelets-itest/src/test/resources/throttle/throttle-action-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/throttle/throttle-action-route.citrus.it.yaml @@ -21,7 +21,7 @@ variables: value: "throttled-message-test" actions: - camel: - jbang: + cli: run: integration: file: "throttle/throttle-action-route.yaml" diff --git a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.citrus.it.yaml index 03a622cfb..b34474a85 100644 --- a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.citrus.it.yaml @@ -26,7 +26,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.citrus.it.yaml index cfbc53c57..1747ffed9 100644 --- a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.citrus.it.yaml @@ -26,7 +26,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: @@ -59,7 +59,7 @@ actions: # Verify timer source - camel: - jbang: + cli: verify: integration: "timer-to-http" logMessage: "Thank You!" diff --git a/tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.citrus.it.yaml index 4b1465592..b1697ce45 100644 --- a/tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.citrus.it.yaml @@ -26,7 +26,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/transformation/drop-field-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/transformation/drop-field-action-pipe.citrus.it.yaml index 0561808f6..80049b9ef 100644 --- a/tests/camel-kamelets-itest/src/test/resources/transformation/drop-field-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/transformation/drop-field-action-pipe.citrus.it.yaml @@ -28,7 +28,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.citrus.it.yaml index 1688a5f20..04237377a 100644 --- a/tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.citrus.it.yaml @@ -28,7 +28,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/transformation/hoist-field-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/transformation/hoist-field-action-pipe.citrus.it.yaml index db8c1da10..72b85deca 100644 --- a/tests/camel-kamelets-itest/src/test/resources/transformation/hoist-field-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/transformation/hoist-field-action-pipe.citrus.it.yaml @@ -28,7 +28,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.citrus.it.yaml index ded3f4177..7ac21be9b 100644 --- a/tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.citrus.it.yaml @@ -30,7 +30,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/transformation/mask-field-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/transformation/mask-field-action-pipe.citrus.it.yaml index 0152846a3..608d4b7e5 100644 --- a/tests/camel-kamelets-itest/src/test/resources/transformation/mask-field-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/transformation/mask-field-action-pipe.citrus.it.yaml @@ -30,7 +30,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/transformation/replace-field-action-pipe.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/transformation/replace-field-action-pipe.citrus.it.yaml index 0b225ec79..c03484cea 100644 --- a/tests/camel-kamelets-itest/src/test/resources/transformation/replace-field-action-pipe.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/transformation/replace-field-action-pipe.citrus.it.yaml @@ -26,7 +26,7 @@ actions: value: "http://localhost:${http.server.port}" # Create Camel JBang integration - camel: - jbang: + cli: run: waitForRunningState: false integration: diff --git a/tests/camel-kamelets-itest/src/test/resources/xj/xj-identity-action-route.citrus.it.yaml b/tests/camel-kamelets-itest/src/test/resources/xj/xj-identity-action-route.citrus.it.yaml index 6a5322254..d5e62b413 100644 --- a/tests/camel-kamelets-itest/src/test/resources/xj/xj-identity-action-route.citrus.it.yaml +++ b/tests/camel-kamelets-itest/src/test/resources/xj/xj-identity-action-route.citrus.it.yaml @@ -18,7 +18,7 @@ name: xj-identity-action-route-test actions: - camel: - jbang: + cli: run: integration: file: "xj/xj-identity-action-route.yaml" @@ -38,7 +38,7 @@ actions: status: 200 reasonPhrase: "OK" - camel: - jbang: + cli: verify: integration: "xj-identity-action-route" logMessage: "name"