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-kamelets.git
The following commit(s) were added to refs/heads/main by this push:
new bd3322920 fix: Citrus integration tests
bd3322920 is described below
commit bd3322920abb0c092b61b9fcd3fad0346eb2dc12
Author: Christoph Deppisch <[email protected]>
AuthorDate: Wed Apr 1 20:02:48 2026 +0200
fix: Citrus integration tests
- Avoid Spring 6.x and 7.x version conflicts
- Update Citrus YAML test file name pattern
---
tests/camel-kamelets-itest/pom.xml | 7 +++++++
.../avro/{avro-data-type.it.yaml => avro-data-type.citrus.it.yaml} | 0
...vro-serdes-action.it.yaml => avro-serdes-action.citrus.it.yaml} | 0
...delete-item.it.yaml => aws-ddb-sink-delete-item.citrus.it.yaml} | 0
...-sink-put-item.it.yaml => aws-ddb-sink-put-item.citrus.it.yaml} | 0
...update-item.it.yaml => aws-ddb-sink-update-item.citrus.it.yaml} | 0
.../ddb/{aws-ddb-source.it.yaml => aws-ddb-source.citrus.it.yaml} | 0
...ventbridge-sink.it.yaml => aws-eventbridge-sink.citrus.it.yaml} | 0
.../{aws-kinesis-sink.it.yaml => aws-kinesis-sink.citrus.it.yaml} | 0
...ws-kinesis-source.it.yaml => aws-kinesis-source.citrus.it.yaml} | 0
.../s3/{aws-s3-to-http.it.yaml => aws-s3-to-http.citrus.it.yaml} | 0
...og-uri-based.it.yaml => aws-s3-to-log-uri-based.citrus.it.yaml} | 0
.../s3/{aws-s3-uri-pipe.it.yaml => aws-s3-uri-pipe.citrus.it.yaml} | 0
...g-uri-based.it.yaml => aws-sqs-to-log-uri-based.citrus.it.yaml} | 0
.../{aws-sqs-uri-pipe.it.yaml => aws-sqs-uri-pipe.citrus.it.yaml} | 0
...arthquake-to-http.it.yaml => earthquake-to-http.citrus.it.yaml} | 0
...sink-pipe.it.yaml => jira-add-comment-sink-pipe.citrus.it.yaml} | 0
...e-sink-pipe.it.yaml => jira-add-issue-sink-pipe.citrus.it.yaml} | 0
.../{jira-source-pipe.it.yaml => jira-source-pipe.citrus.it.yaml} | 0
.../src/test/resources/kafka/application.properties | 4 ++--
...{kafka-router-pipe.it.yaml => kafka-router-pipe.citrus.it.yaml} | 0
.../{kafka-sink-pipe.it.yaml => kafka-sink-pipe.citrus.it.yaml} | 0
...{kafka-source-pipe.it.yaml => kafka-source-pipe.citrus.it.yaml} | 0
.../mail/{mail-sink-pipe.it.yaml => mail-sink-pipe.citrus.it.yaml} | 0
...nk-add-pet.it.yaml => rest-openapi-sink-add-pet.citrus.it.yaml} | 0
...ete-pet.it.yaml => rest-openapi-sink-delete-pet.citrus.it.yaml} | 0
...rotobuf-data-type.it.yaml => protobuf-data-type.citrus.it.yaml} | 0
...serdes-action.it.yaml => protobuf-serdes-action.citrus.it.yaml} | 0
.../{slack-sink-pipe.it.yaml => slack-sink-pipe.citrus.it.yaml} | 0
...{slack-source-pipe.it.yaml => slack-source-pipe.citrus.it.yaml} | 0
...imer-to-http-pipe.it.yaml => timer-to-http-pipe.citrus.it.yaml} | 0
.../timer/{timer-to-http.it.yaml => timer-to-http.citrus.it.yaml} | 0
...pe-action-pipe.it.yaml => data-type-action-pipe.citrus.it.yaml} | 0
...ction-pipe.it.yaml => extract-field-action-pipe.citrus.it.yaml} | 0
...action-pipe.it.yaml => insert-field-action-pipe.citrus.it.yaml} | 0
35 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/tests/camel-kamelets-itest/pom.xml
b/tests/camel-kamelets-itest/pom.xml
index 9fe83cc5e..d5b584e1e 100644
--- a/tests/camel-kamelets-itest/pom.xml
+++ b/tests/camel-kamelets-itest/pom.xml
@@ -134,6 +134,13 @@
<groupId>org.citrusframework</groupId>
<artifactId>citrus-camel</artifactId>
<scope>test</scope>
+ <!-- Temporary exclude camel-spring as it brings newer Spring
version as a transitive dependency -->
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.citrusframework</groupId>
diff --git
a/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-update-item.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-update-item.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-update-item.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-update-item.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-http.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-to-log-uri-based.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/s3/aws-s3-uri-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-to-log-uri-based.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/aws/sqs/aws-sqs-uri-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/earthquake/earthquake-to-http.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/jira/jira-add-comment-sink-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/jira/jira-add-issue-sink-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/jira/jira-source-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/application.properties
b/tests/camel-kamelets-itest/src/test/resources/kafka/application.properties
index 2a0992cbd..93c4b23f3 100644
--- a/tests/camel-kamelets-itest/src/test/resources/kafka/application.properties
+++ b/tests/camel-kamelets-itest/src/test/resources/kafka/application.properties
@@ -18,7 +18,7 @@
kafka.topic=${kafka.topic}
kafka.bootstrapServers=${CITRUS_TESTCONTAINERS_REDPANDA_BOOTSTRAP_SERVERS}
-kafka.user=${kafka.user}
-kafka.password=${kafka.password}
+kafka.saslUsername=${kafka.saslUsername}
+kafka.saslPassword=${kafka.saslPassword}
kafka.securityProtocol=${kafka.securityProtocol}
kafka.deserializeHeaders=${kafka.deserializeHeaders}
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-router-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-sink-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/kafka/kafka-source-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/mail/mail-sink-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-add-pet.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/openapi/rest-openapi-sink-delete-pet.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-data-type.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-data-type.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-data-type.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-data-type.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-serdes-action.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-serdes-action.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-serdes-action.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/protobuf/protobuf-serdes-action.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/slack/slack-sink-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/slack/slack-source-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/timer/timer-to-http.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/transformation/data-type-action-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/transformation/extract-field-action-pipe.citrus.it.yaml
diff --git
a/tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.it.yaml
b/tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.citrus.it.yaml
similarity index 100%
rename from
tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.it.yaml
rename to
tests/camel-kamelets-itest/src/test/resources/transformation/insert-field-action-pipe.citrus.it.yaml
