This is an automated email from the ASF dual-hosted git repository.
cdeppisch pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-jbang-examples.git
The following commit(s) were added to refs/heads/main by this push:
new c07a122 Update to Camel 4.18.0 and Citrus 4.10.0
c07a122 is described below
commit c07a12205b8d176665f9d84c846a040428fb6e72
Author: Christoph Deppisch <[email protected]>
AuthorDate: Fri Mar 20 10:14:25 2026 +0100
Update to Camel 4.18.0 and Citrus 4.10.0
---
.github/workflows/build.yml | 33 +++++-----------
README.adoc | 5 +--
aws/aws-s3-event-based/README.adoc | 11 +-----
...camel.it.yaml => aws-s3-cdc-log.citrus.it.yaml} | 5 +++
.../test/citrus-application.properties | 2 +
aws/aws-s3-event-based/test/jbang.properties | 10 -----
aws/aws-sqs/README.adoc | 13 ++-----
aws/aws-sqs/test/citrus-application.properties | 2 +
...amel.it.yaml => http-to-aws-sqs.citrus.it.yaml} | 2 +
aws/aws-sqs/test/jbang.properties | 7 ----
edi-x12-as2/README.adoc | 4 +-
edi-x12-as2/camel/App.java | 2 +-
edi-x12-as2/test/citrus-application.properties | 2 +
...s2.camel.it.yaml => edi-x12-as2.citrus.it.yaml} | 3 ++
edi-x12-as2/test/jbang.properties | 8 ----
ftp/README.adoc | 5 +--
ftp/compose.yaml | 2 +-
ftp/test/citrus-application.properties | 2 +
ftp/test/{ftp.camel.it.yaml => ftp.citrus.it.yaml} | 1 +
ftp/test/jbang.properties | 9 -----
install-citrus.adoc | 2 +-
kubernetes/secrets/application.properties | 1 +
kubernetes/secrets/news-service.camel.yaml | 27 +++++++++++++
kubernetes/secrets/test/news-secret.properties | 1 +
.../secrets/test/news-service.citrus.it.yaml | 45 ++++++++++++++++++++++
kubernetes/service/news-service.camel.yaml | 27 +++++++++++++
.../service/test/news-service.citrus.it.yaml | 35 +++++++++++++++++
mqtt/README.adoc | 5 +--
mqtt/test/citrus-application.properties | 2 +
mqtt/test/jbang.properties | 6 ---
.../{mqtt.camel.it.yaml => mqtt.citrus.it.yaml} | 0
openapi/client/README.adoc | 5 +--
openapi/client/test/citrus-application.properties | 5 +++
openapi/client/test/jbang.properties | 5 ---
...amel.it.yaml => petstore-client.citrus.it.yaml} | 0
openapi/server/README.adoc | 5 +--
openapi/server/test/citrus-application.properties | 2 +
openapi/server/test/jbang.properties | 5 ---
...store.camel.it.yaml => petstore.citrus.it.yaml} | 0
smart-log-analyzer/README.adoc | 3 +-
.../test/citrus-application.properties | 2 +
...amel.it.yaml => first-iteration.citrus.it.yaml} | 1 +
.../first-iteration/test/jbang.properties | 3 --
43 files changed, 197 insertions(+), 118 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3748e9a..cda88dc 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -61,37 +61,22 @@ jobs:
echo "Running tests"
- pushd ftp/test
- jbang citrus@citrusframework/citrus run ftp.camel.it.yaml
- popd
+ jbang citrus@citrusframework/citrus run ftp/test
- pushd mqtt/test
- jbang citrus@citrusframework/citrus run mqtt.camel.it.yaml
- popd
+ jbang citrus@citrusframework/citrus run mqtt/test
- pushd openapi/server/test
- jbang citrus@citrusframework/citrus run petstore.camel.it.yaml
- popd
+ jbang citrus@citrusframework/citrus run openapi/server/test
- pushd openapi/client/test
- jbang citrus@citrusframework/citrus run petstore-client.camel.it.yaml
- popd
+ jbang citrus@citrusframework/citrus run openapi/client/test
- pushd aws/aws-s3-event-based/test
- jbang citrus@citrusframework/citrus run aws-s3-cdc-log.camel.it.yaml
- popd
+ jbang citrus@citrusframework/citrus run aws/aws-s3-event-based/test
- pushd aws/aws-sqs/test
- jbang citrus@citrusframework/citrus run http-to-aws-sqs.camel.it.yaml
- popd
+ jbang citrus@citrusframework/citrus run aws/aws-sqs/test
- pushd edi-x12-as2/test
- jbang citrus@citrusframework/citrus run edi-x12-as2.camel.it.yaml
- popd
+ jbang citrus@citrusframework/citrus run edi-x12-as2/test
+
+ jbang citrus@citrusframework/citrus run
smart-log-analyzer/first-iteration/test
- pushd smart-log-analyzer/first-iteration/test
- jbang citrus@citrusframework/citrus run first-iteration.camel.it.yaml
- popd
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874
# v4.4.0
if: always()
with:
diff --git a/README.adoc b/README.adoc
index a9f4119..53c8757 100644
--- a/README.adoc
+++ b/README.adoc
@@ -64,13 +64,12 @@ citrus --version
Usually the Citrus tests are written in YAML files and named accordingly to
the Camel JBang route source file.
-For instance the Camel route `mqtt.camel.yaml` route provides a test named
`mqtt.camel.it.yaml`.
+For instance the Camel route `mqtt.camel.yaml` route provides a test named
`mqtt.citrus.it.yaml`.
You can run the test with Citrus JBang like this:
[source,shell]
----
-cd test
-citrus run mqtt.camel.it.yaml
+citrus run test/mqtt.citrus.it.yaml
----
Usually the test prepares the complete infrastructure (e.g. via Docker
compose) and starts the Camel route automatically via JBang.
diff --git a/aws/aws-s3-event-based/README.adoc
b/aws/aws-s3-event-based/README.adoc
index 9a35db3..127f459 100644
--- a/aws/aws-s3-event-based/README.adoc
+++ b/aws/aws-s3-event-based/README.adoc
@@ -169,21 +169,14 @@ At the end the AWS environment on your account will be
clean.
== Integration testing
-The example provides an automated integration test
(`aws-s3-cdc-log.camel.it.yaml`) that you can run with the
https://citrusframework.org/[Citrus] test framework.
+The example provides an automated integration test
(`aws-s3-cdc-log.citrus.it.yaml`) that you can run with the
https://citrusframework.org/[Citrus] test framework.
Please make sure to install Citrus as a JBang application (see
link:../../install-citrus.adoc[Citrus installation guide]).
-Navigate to the test folder.
-
-[source,shell]
-----
-cd test/
-----
-
You can run the test with:
[source,shell]
----
-citrus run aws-s3-cdc-log.camel.it.yaml
+citrus run test/aws-s3-cdc-log.citrus.it.yaml
----
The test prepares the complete infrastructure and starts the Camel route
automatically via JBang.
diff --git a/aws/aws-s3-event-based/test/aws-s3-cdc-log.camel.it.yaml
b/aws/aws-s3-event-based/test/aws-s3-cdc-log.citrus.it.yaml
similarity index 82%
rename from aws/aws-s3-event-based/test/aws-s3-cdc-log.camel.it.yaml
rename to aws/aws-s3-event-based/test/aws-s3-cdc-log.citrus.it.yaml
index 43391e8..059e640 100644
--- a/aws/aws-s3-event-based/test/aws-s3-cdc-log.camel.it.yaml
+++ b/aws/aws-s3-event-based/test/aws-s3-cdc-log.citrus.it.yaml
@@ -1,3 +1,8 @@
+# deps: org.apache.camel:camel-endpointdsl:4.18.0
+# deps: org.apache.camel:camel-aws2-s3:4.18.0
+# deps: org.apache.camel:camel-aws2-sqs:4.18.0
+# deps: org.apache.camel:camel-aws2-eventbridge:4.18.0
+# deps: software.amazon.awssdk:sdk-core:2.41.28
name: aws-s3-cdc-log-test
description: Sample test in YAML
variables:
diff --git a/aws/aws-s3-event-based/test/citrus-application.properties
b/aws/aws-s3-event-based/test/citrus-application.properties
new file mode 100644
index 0000000..67a108f
--- /dev/null
+++ b/aws/aws-s3-event-based/test/citrus-application.properties
@@ -0,0 +1,2 @@
+# Enable dump of Camel JBang integration output
+citrus.camel.jbang.dump.integration.output=true
diff --git a/aws/aws-s3-event-based/test/jbang.properties
b/aws/aws-s3-event-based/test/jbang.properties
deleted file mode 100644
index 23eaa81..0000000
--- a/aws/aws-s3-event-based/test/jbang.properties
+++ /dev/null
@@ -1,10 +0,0 @@
-# Declare required additional dependencies
-run.deps=org.citrusframework:citrus-camel:4.9.1,\
-org.citrusframework:citrus-testcontainers:4.9.1,\
-org.apache.camel:camel-endpointdsl:4.17.0,\
-org.apache.camel:camel-aws2-s3:4.17.0,\
-org.apache.camel:camel-aws2-sqs:4.17.0,\
-org.apache.camel:camel-aws2-eventbridge:4.17.0,\
-software.amazon.awssdk:sdk-core:2.41.2
-# Enable dump of Camel JBang integration output
-run.D=citrus.camel.jbang.dump.integration.output=true
diff --git a/aws/aws-sqs/README.adoc b/aws/aws-sqs/README.adoc
index ed93d6d..47b623e 100644
--- a/aws/aws-sqs/README.adoc
+++ b/aws/aws-sqs/README.adoc
@@ -19,7 +19,7 @@ To start an AWS SQS instance, run the following command:
camel infra run aws sqs
----
-Add or replace the following information to the `application.properties` file:
+Add or replace the following information to the `application.properties` file:
[source,properties]
----
@@ -86,21 +86,14 @@ You will see the message content being processed and the
AWS SQS queue should re
== Integration testing
-The example provides an automated integration test
(`http-to-aws-sqs.camel.it.yaml`) that you can run with the
https://citrusframework.org/[Citrus] test framework.
+The example provides an automated integration test
(`http-to-aws-sqs.citrus.it.yaml`) that you can run with the
https://citrusframework.org/[Citrus] test framework.
Please make sure to install Citrus as a JBang application (see
link:../../install-citrus.adoc[Citrus installation guide]).
-Navigate to the test folder.
-
-[source,shell]
-----
-cd test/
-----
-
You can run the test with:
[source,shell]
----
-citrus run http-to-aws-sqs.camel.it.yaml
+citrus run test/http-to-aws-sqs.citrus.it.yaml
----
The test prepares the complete infrastructure and starts the Camel route
automatically via JBang.
diff --git a/aws/aws-sqs/test/citrus-application.properties
b/aws/aws-sqs/test/citrus-application.properties
new file mode 100644
index 0000000..67a108f
--- /dev/null
+++ b/aws/aws-sqs/test/citrus-application.properties
@@ -0,0 +1,2 @@
+# Enable dump of Camel JBang integration output
+citrus.camel.jbang.dump.integration.output=true
diff --git a/aws/aws-sqs/test/http-to-aws-sqs.camel.it.yaml
b/aws/aws-sqs/test/http-to-aws-sqs.citrus.it.yaml
similarity index 92%
rename from aws/aws-sqs/test/http-to-aws-sqs.camel.it.yaml
rename to aws/aws-sqs/test/http-to-aws-sqs.citrus.it.yaml
index da2ed72..90728dc 100644
--- a/aws/aws-sqs/test/http-to-aws-sqs.camel.it.yaml
+++ b/aws/aws-sqs/test/http-to-aws-sqs.citrus.it.yaml
@@ -1,3 +1,5 @@
+# deps: org.apache.camel:camel-aws2-sqs:4.18.0
+# deps: software.amazon.awssdk:sdk-core:2.41.28
name: http-to-aws-sqs
description: Sample test in YAML
variables:
diff --git a/aws/aws-sqs/test/jbang.properties
b/aws/aws-sqs/test/jbang.properties
deleted file mode 100644
index 4ab97af..0000000
--- a/aws/aws-sqs/test/jbang.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-# Declare required additional dependencies
-run.deps=org.citrusframework:citrus-camel:4.9.1,\
-org.citrusframework:citrus-testcontainers:4.9.1,\
-org.apache.camel:camel-aws2-sqs:4.17.0,\
-software.amazon.awssdk:sdk-core:2.41.2
-# Enable dump of Camel JBang integration output
-run.D=citrus.camel.jbang.dump.integration.output=true
diff --git a/edi-x12-as2/README.adoc b/edi-x12-as2/README.adoc
index 5d9902c..470904b 100644
--- a/edi-x12-as2/README.adoc
+++ b/edi-x12-as2/README.adoc
@@ -44,13 +44,13 @@ include::../install.adoc[see installation]
== Integration testing
-The example provides an automated integration test
(`edi-x12-as2.camel.it.yaml`) that you can run with the
https://citrusframework.org/[Citrus] test framework. Please make sure to have
installed Citrus as a JBang application.
+The example provides an automated integration test
(`edi-x12-as2.citrus.it.yaml`) that you can run with the
https://citrusframework.org/[Citrus] test framework. Please make sure to have
installed Citrus as a JBang application.
You can run the test with:
[source,shell]
----
-cd test && citrus run edi-x12-as2.camel.it.yaml
+citrus run test/edi-x12-as2.citrus.it.yaml
----
The test prepares the complete infrastructure and starts the Camel route
automatically via JBang. The test sends some test data to the AS2 endpoint and
verifies that the Camel route successfully processed the purchase order.
diff --git a/edi-x12-as2/camel/App.java b/edi-x12-as2/camel/App.java
index eba6606..1efc351 100644
--- a/edi-x12-as2/camel/App.java
+++ b/edi-x12-as2/camel/App.java
@@ -1,4 +1,4 @@
//DEPS org.apache.activemq:artemis-jakarta-server:2.42.0
-//DEPS org.apache.camel:camel-http:4.17.0
+//DEPS org.apache.camel:camel-http:4.18.0
//DEPS org.smooks.cartridges.edi:smooks-edi-cartridge:2.1.0
//DEPS org.smooks.cartridges:smooks-templating-cartridge:2.1.2
diff --git a/edi-x12-as2/test/citrus-application.properties
b/edi-x12-as2/test/citrus-application.properties
new file mode 100644
index 0000000..67a108f
--- /dev/null
+++ b/edi-x12-as2/test/citrus-application.properties
@@ -0,0 +1,2 @@
+# Enable dump of Camel JBang integration output
+citrus.camel.jbang.dump.integration.output=true
diff --git a/edi-x12-as2/test/edi-x12-as2.camel.it.yaml
b/edi-x12-as2/test/edi-x12-as2.citrus.it.yaml
similarity index 89%
rename from edi-x12-as2/test/edi-x12-as2.camel.it.yaml
rename to edi-x12-as2/test/edi-x12-as2.citrus.it.yaml
index c4b4f64..8b04119 100644
--- a/edi-x12-as2/test/edi-x12-as2.camel.it.yaml
+++ b/edi-x12-as2/test/edi-x12-as2.citrus.it.yaml
@@ -1,3 +1,6 @@
+# deps: org.apache.activemq:artemis-jakarta-client:2.42.0
+# deps: jakarta.inject:jakarta.inject-api:2.0.1
+# deps: jakarta.enterprise:jakarta.enterprise.cdi-api:4.1.0
name: edi-x12-as2-camel-test
description: Verify EDI X12 over AS2 Camel route
actions:
diff --git a/edi-x12-as2/test/jbang.properties
b/edi-x12-as2/test/jbang.properties
deleted file mode 100644
index 1cb26c4..0000000
--- a/edi-x12-as2/test/jbang.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-# Declare required additional dependencies for testing
-run.deps=org.citrusframework:citrus-camel:4.9.1,\
- org.citrusframework:citrus-testcontainers:4.9.1,\
- org.citrusframework:citrus-jms:4.9.1,\
- org.apache.activemq:artemis-jakarta-client:2.42.0,\
- org.apache.camel:camel-as2:4.17.0,\
- jakarta.inject:jakarta.inject-api:2.0.1,\
- jakarta.enterprise:jakarta.enterprise.cdi-api:4.1.0
diff --git a/ftp/README.adoc b/ftp/README.adoc
index 7714222..eacc8f9 100644
--- a/ftp/README.adoc
+++ b/ftp/README.adoc
@@ -89,15 +89,14 @@ Then you can browse: http://localhost:8080/q/dev to
introspect the running Camel
== Integration testing
-The example provides an automated integration test (`ftp.camel.it.yaml`) that
you can run with the https://citrusframework.org/[Citrus] test framework.
+The example provides an automated integration test (`ftp.citrus.it.yaml`) that
you can run with the https://citrusframework.org/[Citrus] test framework.
Please make sure to install Citrus as a JBang application (see
link:../../install-citrus.adoc[Citrus installation guide]).
You may run the test with:
[source,shell]
----
-cd test
-citrus run ftp.camel.it.yaml
+citrus run test/ftp.citrus.it.yaml
----
== More Information
diff --git a/ftp/compose.yaml b/ftp/compose.yaml
index 4749ac3..507ee52 100644
--- a/ftp/compose.yaml
+++ b/ftp/compose.yaml
@@ -1,7 +1,7 @@
services:
artemis:
- image: mirror.gcr.io/apache/activemq-artemis:2.42.0
+ image: mirror.gcr.io/apache/artemis:2.52.0
ports:
- "8161:8161"
- "61616:61616"
diff --git a/ftp/test/citrus-application.properties
b/ftp/test/citrus-application.properties
new file mode 100644
index 0000000..67a108f
--- /dev/null
+++ b/ftp/test/citrus-application.properties
@@ -0,0 +1,2 @@
+# Enable dump of Camel JBang integration output
+citrus.camel.jbang.dump.integration.output=true
diff --git a/ftp/test/ftp.camel.it.yaml b/ftp/test/ftp.citrus.it.yaml
similarity index 94%
rename from ftp/test/ftp.camel.it.yaml
rename to ftp/test/ftp.citrus.it.yaml
index 3a8741c..1f44edc 100644
--- a/ftp/test/ftp.camel.it.yaml
+++ b/ftp/test/ftp.citrus.it.yaml
@@ -1,3 +1,4 @@
+# deps: org.apache.activemq:artemis-jakarta-client:2.52.0
name: ftp-camel-test
description: Test verifying the ActiveMQ to Ftp Camel route
variables:
diff --git a/ftp/test/jbang.properties b/ftp/test/jbang.properties
deleted file mode 100644
index 5cd5d50..0000000
--- a/ftp/test/jbang.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-# Declare required additional dependencies for testing
-run.deps=org.citrusframework:citrus-camel:4.9.1,\
-org.citrusframework:citrus-testcontainers:4.9.1,\
-org.citrusframework:citrus-jms:4.9.1,\
-org.apache.activemq:artemis-jakarta-client:2.42.0,\
-jakarta.inject:jakarta.inject-api:2.0.1,\
-jakarta.enterprise:jakarta.enterprise.cdi-api:4.1.0
-# Enable dump of Camel JBang integration output
-run.D=citrus.camel.jbang.dump.integration.output=true
diff --git a/install-citrus.adoc b/install-citrus.adoc
index 7c949df..bb50c0b 100644
--- a/install-citrus.adoc
+++ b/install-citrus.adoc
@@ -14,7 +14,7 @@ Now you can run Citrus with the command `citrus` to execute
some tests:
.Run my.camel.it.yaml
[source,shell]
----
-citrus run my.camel.it.yaml
+citrus run my.citrus.it.yaml
----
For more information about using Citrus JBang please refer to the
https://citrusframework.org/citrus/reference/html/index.html#runtime-jbang-install[Citrus
installation guide].
diff --git a/kubernetes/secrets/application.properties
b/kubernetes/secrets/application.properties
new file mode 100644
index 0000000..e0bfb5e
--- /dev/null
+++ b/kubernetes/secrets/application.properties
@@ -0,0 +1 @@
+camel.kubernetes-config.mount-path-secrets=/etc/camel/secrets/
diff --git a/kubernetes/secrets/news-service.camel.yaml
b/kubernetes/secrets/news-service.camel.yaml
new file mode 100644
index 0000000..750dbe8
--- /dev/null
+++ b/kubernetes/secrets/news-service.camel.yaml
@@ -0,0 +1,27 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+- route:
+ from:
+ uri: "platform-http:/news?httpMethodRestrict=GET"
+ steps:
+ - setBody:
+ constant: "{{news.headline}}"
+ - to:
+ uri: "log:info"
+ parameters:
+ showHeaders: "true"
diff --git a/kubernetes/secrets/test/news-secret.properties
b/kubernetes/secrets/test/news-secret.properties
new file mode 100644
index 0000000..516390a
--- /dev/null
+++ b/kubernetes/secrets/test/news-secret.properties
@@ -0,0 +1 @@
+news.headline=Hello from Camel
diff --git a/kubernetes/secrets/test/news-service.citrus.it.yaml
b/kubernetes/secrets/test/news-service.citrus.it.yaml
new file mode 100644
index 0000000..77a0b5f
--- /dev/null
+++ b/kubernetes/secrets/test/news-service.citrus.it.yaml
@@ -0,0 +1,45 @@
+name: news-service-test
+description: Sample test in YAML
+variables:
+ - name: "news.headline"
+ value: "Hello from Camel"
+actions:
+ - kubernetes:
+ createSecret:
+ name: "news-secret"
+ file: "news-secret.properties"
+ - camel:
+ jbang:
+ kubernetes:
+ run:
+ autoRemove: true
+ clusterType: kind
+ integration:
+ file: "../news-service.camel.yaml"
+ args:
+ - "--config"
+ - "secret:news-secret@/etc/camel/secrets/"
+ - camel:
+ jbang:
+ kubernetes:
+ verify:
+ integration: news-service
+ logMessage: "Routes startup"
+ - kubernetes:
+ connect:
+ service:
+ name: news-service
+ port: 8080
+ - http:
+ client: "news-service.client"
+ sendRequest:
+ GET:
+ path: "/news"
+ - http:
+ client: "news-service.client"
+ receiveResponse:
+ response:
+ status: 200
+ body:
+ data: "${news.headline}"
+ contentType: "text/plain;charset=UTF-8"
diff --git a/kubernetes/service/news-service.camel.yaml
b/kubernetes/service/news-service.camel.yaml
new file mode 100644
index 0000000..f91a5b3
--- /dev/null
+++ b/kubernetes/service/news-service.camel.yaml
@@ -0,0 +1,27 @@
+## ---------------------------------------------------------------------------
+## Licensed to the Apache Software Foundation (ASF) under one or more
+## contributor license agreements. See the NOTICE file distributed with
+## this work for additional information regarding copyright ownership.
+## The ASF licenses this file to You under the Apache License, Version 2.0
+## (the "License"); you may not use this file except in compliance with
+## the License. You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+## ---------------------------------------------------------------------------
+
+- route:
+ from:
+ uri: "platform-http:/news?httpMethodRestrict=GET"
+ steps:
+ - setBody:
+ constant: "Hello from Camel"
+ - to:
+ uri: "log:info"
+ parameters:
+ showHeaders: "true"
diff --git a/kubernetes/service/test/news-service.citrus.it.yaml
b/kubernetes/service/test/news-service.citrus.it.yaml
new file mode 100644
index 0000000..0f61f8d
--- /dev/null
+++ b/kubernetes/service/test/news-service.citrus.it.yaml
@@ -0,0 +1,35 @@
+name: news-service-test
+description: Sample test in YAML
+actions:
+ - camel:
+ jbang:
+ kubernetes:
+ run:
+ autoRemove: true
+ clusterType: kind
+ integration:
+ file: "../news-service.camel.yaml"
+ - camel:
+ jbang:
+ kubernetes:
+ verify:
+ integration: news-service
+ logMessage: "Routes startup"
+ - kubernetes:
+ connect:
+ service:
+ name: news-service
+ port: 8080
+ - http:
+ client: "news-service.client"
+ sendRequest:
+ GET:
+ path: "/news"
+ - http:
+ client: "news-service.client"
+ receiveResponse:
+ response:
+ status: 200
+ body:
+ data: "Hello from Camel"
+ contentType: "text/plain;charset=UTF-8"
diff --git a/mqtt/README.adoc b/mqtt/README.adoc
index 15508d3..a6dc57f 100644
--- a/mqtt/README.adoc
+++ b/mqtt/README.adoc
@@ -93,15 +93,14 @@ camel stop mqtt
== Integration testing
-The example provides an automated integration test (`mqtt.camel.it.yaml`) that
you can run with the https://citrusframework.org/[Citrus] test framework.
+The example provides an automated integration test (`mqtt.citrus.it.yaml`)
that you can run with the https://citrusframework.org/[Citrus] test framework.
Please make sure to install Citrus as a JBang application (see
link:../../install-citrus.adoc[Citrus installation guide]).
You can run the test with:
[source,shell]
----
-cd test
-citrus run mqtt.camel.it.yaml
+citrus run test/mqtt.citrus.it.yaml
----
The test prepares the complete infrastructure (e.g. via Docker compose) and
starts the Camel route automatically via JBang.
diff --git a/mqtt/test/citrus-application.properties
b/mqtt/test/citrus-application.properties
new file mode 100644
index 0000000..67a108f
--- /dev/null
+++ b/mqtt/test/citrus-application.properties
@@ -0,0 +1,2 @@
+# Enable dump of Camel JBang integration output
+citrus.camel.jbang.dump.integration.output=true
diff --git a/mqtt/test/jbang.properties b/mqtt/test/jbang.properties
deleted file mode 100644
index 47b1b32..0000000
--- a/mqtt/test/jbang.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# Declare required additional dependencies
-run.deps=org.citrusframework:citrus-camel:4.9.1,\
-org.citrusframework:citrus-testcontainers:4.9.1,\
-org.apache.camel:camel-paho-mqtt5:4.17.0
-# Enable dump of Camel JBang integration output
-run.D=citrus.camel.jbang.dump.integration.output=true
diff --git a/mqtt/test/mqtt.camel.it.yaml b/mqtt/test/mqtt.citrus.it.yaml
similarity index 100%
rename from mqtt/test/mqtt.camel.it.yaml
rename to mqtt/test/mqtt.citrus.it.yaml
diff --git a/openapi/client/README.adoc b/openapi/client/README.adoc
index 14c9734..e6d8cc4 100644
--- a/openapi/client/README.adoc
+++ b/openapi/client/README.adoc
@@ -38,15 +38,14 @@ Now you should see the client invoking the REST service
using the OpenAPI specif
== Integration testing
-The example provides an automated integration test
(`petstore-client.camel.it.yaml`) that you can run with the
https://citrusframework.org/[Citrus] test framework.
+The example provides an automated integration test
(`petstore-client.citrus.it.yaml`) that you can run with the
https://citrusframework.org/[Citrus] test framework.
Please make sure to install Citrus as a JBang application (see
link:../../install-citrus.adoc[Citrus installation guide]).
You can run the test with:
[source,shell]
----
-cd test
-citrus run petstore-client.camel.it.yaml
+citrus test/run petstore-client.citrus.it.yaml
----
The test prepares the complete infrastructure and starts the Camel route
automatically via JBang.
diff --git a/openapi/client/test/citrus-application.properties
b/openapi/client/test/citrus-application.properties
new file mode 100644
index 0000000..2c9a8da
--- /dev/null
+++ b/openapi/client/test/citrus-application.properties
@@ -0,0 +1,5 @@
+# Enable dump of Camel JBang integration output
+citrus.camel.jbang.dump.integration.output=true
+
+# Disable extended OpenAPI request validation
+citrus.openapi.validation.enabled.request=false
diff --git a/openapi/client/test/jbang.properties
b/openapi/client/test/jbang.properties
deleted file mode 100644
index fd3df15..0000000
--- a/openapi/client/test/jbang.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Declare required additional dependencies
-run.deps=org.citrusframework:citrus-camel:4.9.1,\
-org.citrusframework:citrus-openapi:4.9.1
-# Enable dump of Camel JBang integration output
-run.D=citrus.camel.jbang.dump.integration.output=true,citrus.openapi.validation.enabled.request=false
diff --git a/openapi/client/test/petstore-client.camel.it.yaml
b/openapi/client/test/petstore-client.citrus.it.yaml
similarity index 100%
rename from openapi/client/test/petstore-client.camel.it.yaml
rename to openapi/client/test/petstore-client.citrus.it.yaml
diff --git a/openapi/server/README.adoc b/openapi/server/README.adoc
index b1beda0..feb5594 100644
--- a/openapi/server/README.adoc
+++ b/openapi/server/README.adoc
@@ -61,15 +61,14 @@ The REST service in Camel is configured to load example
response data from a dir
== Integration testing
-The example provides an automated integration test (`petstore.camel.it.yaml`)
that you can run with the https://citrusframework.org/[Citrus] test framework.
+The example provides an automated integration test (`petstore.citrus.it.yaml`)
that you can run with the https://citrusframework.org/[Citrus] test framework.
Please make sure to install Citrus as a JBang application (see
link:../../install-citrus.adoc[Citrus installation guide]).
You can run the test with:
[source,shell]
----
-cd test
-citrus run petstore.camel.it.yaml
+citrus run test/petstore.citrus.it.yaml
----
The test prepares the complete infrastructure and starts the Camel route
automatically via JBang.
diff --git a/openapi/server/test/citrus-application.properties
b/openapi/server/test/citrus-application.properties
new file mode 100644
index 0000000..67a108f
--- /dev/null
+++ b/openapi/server/test/citrus-application.properties
@@ -0,0 +1,2 @@
+# Enable dump of Camel JBang integration output
+citrus.camel.jbang.dump.integration.output=true
diff --git a/openapi/server/test/jbang.properties
b/openapi/server/test/jbang.properties
deleted file mode 100644
index 8daeb37..0000000
--- a/openapi/server/test/jbang.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-# Declare required additional dependencies
-run.deps=org.citrusframework:citrus-camel:4.9.1,\
-org.citrusframework:citrus-openapi:4.9.1
-# Enable dump of Camel JBang integration output
-run.D=citrus.camel.jbang.dump.integration.output=true
diff --git a/openapi/server/test/petstore.camel.it.yaml
b/openapi/server/test/petstore.citrus.it.yaml
similarity index 100%
rename from openapi/server/test/petstore.camel.it.yaml
rename to openapi/server/test/petstore.citrus.it.yaml
diff --git a/smart-log-analyzer/README.adoc b/smart-log-analyzer/README.adoc
index c96d25b..d56373d 100644
--- a/smart-log-analyzer/README.adoc
+++ b/smart-log-analyzer/README.adoc
@@ -74,8 +74,7 @@ Then run the test:
[source,bash]
----
-cd first-iteration/test
-citrus run first-iteration.camel.it.yaml
+citrus run first-iteration/test/first-iteration.citrus.it.yaml
----
The test starts Kafka via testcontainers, sends log events, and verifies the
aggregation triggers correctly.
diff --git
a/smart-log-analyzer/first-iteration/test/citrus-application.properties
b/smart-log-analyzer/first-iteration/test/citrus-application.properties
new file mode 100644
index 0000000..67a108f
--- /dev/null
+++ b/smart-log-analyzer/first-iteration/test/citrus-application.properties
@@ -0,0 +1,2 @@
+# Enable dump of Camel JBang integration output
+citrus.camel.jbang.dump.integration.output=true
diff --git
a/smart-log-analyzer/first-iteration/test/first-iteration.camel.it.yaml
b/smart-log-analyzer/first-iteration/test/first-iteration.citrus.it.yaml
similarity index 95%
rename from
smart-log-analyzer/first-iteration/test/first-iteration.camel.it.yaml
rename to smart-log-analyzer/first-iteration/test/first-iteration.citrus.it.yaml
index 900b164..c1fbeae 100644
--- a/smart-log-analyzer/first-iteration/test/first-iteration.camel.it.yaml
+++ b/smart-log-analyzer/first-iteration/test/first-iteration.citrus.it.yaml
@@ -1,3 +1,4 @@
+# deps: org.apache.camel:camel-test-infra-kafka:4.17.0
name: first-iteration-test
description: Integration test for the first-iteration log analyzer prototype
variables:
diff --git a/smart-log-analyzer/first-iteration/test/jbang.properties
b/smart-log-analyzer/first-iteration/test/jbang.properties
deleted file mode 100644
index 8be759f..0000000
--- a/smart-log-analyzer/first-iteration/test/jbang.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-run.deps=org.citrusframework:citrus-kafka:4.9.1,\
- org.apache.camel:camel-test-infra-kafka:4.17.0,\
- org.apache.camel:camel-kafka:4.17.0
