Skip to content

Commit bd33229

Browse files
christophdCroway
christophd
authored and
Croway
committed
fix: Citrus integration tests
- Avoid Spring 6.x and 7.x version conflicts - Update Citrus YAML test file name pattern
1 parent e16a230 commit bd33229

35 files changed

Lines changed: 9 additions & 2 deletions

‎tests/camel-kamelets-itest/pom.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,13 @@
134134
<groupId>org.citrusframework</groupId>
135135
<artifactId>citrus-camel</artifactId>
136136
<scope>test</scope>
137+
<!-- Temporary exclude camel-spring as it brings newer Spring version as a transitive dependency -->
138+
<exclusions>
139+
<exclusion>
140+
<groupId>org.apache.camel</groupId>
141+
<artifactId>camel-spring</artifactId>
142+
</exclusion>
143+
</exclusions>
137144
</dependency>
138145
<dependency>
139146
<groupId>org.citrusframework</groupId>

tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.it.yaml renamed to tests/camel-kamelets-itest/src/test/resources/avro/avro-data-type.citrus.it.yaml

File renamed without changes.

tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.it.yaml renamed to tests/camel-kamelets-itest/src/test/resources/avro/avro-serdes-action.citrus.it.yaml

File renamed without changes.

tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.it.yaml renamed to tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-delete-item.citrus.it.yaml

File renamed without changes.

tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.it.yaml renamed to tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-put-item.citrus.it.yaml

File renamed without changes.

tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-update-item.it.yaml renamed to tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-sink-update-item.citrus.it.yaml

File renamed without changes.

tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.it.yaml renamed to tests/camel-kamelets-itest/src/test/resources/aws/ddb/aws-ddb-source.citrus.it.yaml

File renamed without changes.

tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.it.yaml renamed to tests/camel-kamelets-itest/src/test/resources/aws/eventbridge/aws-eventbridge-sink.citrus.it.yaml

File renamed without changes.

tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.it.yaml renamed to tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-sink.citrus.it.yaml

File renamed without changes.

tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.it.yaml renamed to tests/camel-kamelets-itest/src/test/resources/aws/kinesis/aws-kinesis-source.citrus.it.yaml

File renamed without changes.

0 commit comments

Comments
 (0)