chore(deps): Update to Citrus 5.0.0

pom.xml

@@ -75,7 +75,7 @@
 
         <camel.version>4.21.0</camel.version>
 
-        <citrus.version>4.10.3</citrus.version>
+        <citrus.version>5.0.0</citrus.version>
         <jose4j.version>0.9.6</jose4j.version>
 
         <!-- Versions used inside Kamelets (add them also to the dependencyManagement section and the groovy script below) -->

tests/camel-kamelets-itest/pom.xml

@@ -160,7 +160,7 @@
         </dependency>
         <dependency>
             <groupId>org.citrusframework</groupId>
-            <artifactId>citrus-junit5</artifactId>
+            <artifactId>citrus-junit-jupiter</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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

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

@@ -20,24 +20,24 @@ 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"
             - "${avro.webhook.server.port}"
           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: |

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

@@ -20,24 +20,24 @@ 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"
             - "${avro.webhook.server.port}"
           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: |

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"

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"

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: |

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: |

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

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: |

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}"

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}"